feat: drop support for PHP < 8.1, symfony < 6.4 (WIP)

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     name: PHPStan
     runs-on: ubuntu-latest
     env:
-      php-version: 8.4
+      php-version: 8.5
     steps:
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -19,7 +19,7 @@ jobs:
           tools: flex
 
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Install Composer dependencies"
         uses: "ramsey/composer-install@v3"
@@ -35,7 +35,7 @@ jobs:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     env:
-      php-version: 8.4
+      php-version: 8.5
       PHP_CS_FIXER_IGNORE_ENV: 1
     steps:
       - name: "Setup PHP"
@@ -45,7 +45,7 @@ jobs:
           tools: flex, cs2pr
 
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Install Composer dependencies"
         uses: "ramsey/composer-install@v3"
@@ -62,29 +62,15 @@ jobs:
       max-parallel: 10
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
-        sf_version: [ '5.4.*', '6.4.*', '7.2.*', '7.3.*' ]
+        php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
+        sf_version: [ '6.4.*', '7.4.*' ]
         exclude:
-          - php: '7.4'
-            sf_version: '6.4.*'
-          - php: '8.0'
-            sf_version: '6.4.*'
-          - php: '7.4'
-            sf_version: '7.2.*'
-          - php: '8.0'
-            sf_version: '7.2.*'
           - php: '8.1'
-            sf_version: '7.2.*'
-          - php: '7.4'
-            sf_version: '7.3.*'
-          - php: '8.0'
-            sf_version: '7.3.*'
-          - php: '8.1'
-            sf_version: '7.3.*'
+            sf_version: '7.4.*'
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 The changelog describes what have been "Added", "Changed", "Removed" or "Fixed" between versions.
 
+## Version 6.0
+
+### Added
+
+- PHP 8 language features
+
+### Removed
+
+- Remove support for PHP < 8.1
+- Remove MapzenFactory
+- Remove GeoIPsFactory
+
 ## Version 5.19.0
 
 ### Changed

composer.json

@@ -14,65 +14,63 @@
     }
   ],
   "require": {
-    "php": "^7.4 || ^8.0",
-    "geocoder-php/plugin": "^1.5",
+    "php": "^8.1",
+    "geocoder-php/plugin": "^1.6",
     "php-http/curl-client": "^2.3",
-    "php-http/discovery": "^1.14",
-    "symfony/console": "^5.4 || ^6.4 || ^7.0",
-    "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
-    "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
-    "willdurand/geocoder": "^4.6|^5.0"
+    "php-http/discovery": "^1.20",
+    "symfony/console": "^6.4 || ^7.0",
+    "symfony/framework-bundle": "^6.4 || ^7.0",
+    "symfony/options-resolver": " ^6.4 || ^7.0",
+    "willdurand/geocoder": "^4.6.0 || ^5.0"
   },
   "require-dev": {
     "doctrine/annotations": "^1.11.1 || ^2.0",
-    "doctrine/doctrine-bundle": "^2.3",
+    "doctrine/doctrine-bundle": "^2.18",
     "doctrine/orm": "^2.8 || ^3.0",
-    "fakerphp/faker": "^1.20",
+    "fakerphp/faker": "^1.24",
     "friendsofphp/php-cs-fixer": "^3.13",
-    "geocoder-php/algolia-places-provider": "^0.4",
-    "geocoder-php/arcgis-online-provider": "^4.4",
-    "geocoder-php/bing-maps-provider": "^4.3",
-    "geocoder-php/cache-provider": "^4.4.0",
-    "geocoder-php/chain-provider": "^4.5",
-    "geocoder-php/free-geoip-provider": "^4.5",
-    "geocoder-php/geo-plugin-provider": "^4.3",
-    "geocoder-php/geoip2-provider": "^4.3",
-    "geocoder-php/geoips-provider": "^4.0",
-    "geocoder-php/geonames-provider": "^4.4",
-    "geocoder-php/google-maps-places-provider": "^1.4",
-    "geocoder-php/google-maps-provider": "^4.7",
-    "geocoder-php/here-provider": "^0.7",
-    "geocoder-php/host-ip-provider": "^4.4",
-    "geocoder-php/ip-info-db-provider": "^4.3",
-    "geocoder-php/ip-info-provider": "^0.4",
-    "geocoder-php/ipstack-provider": "^0.4",
-    "geocoder-php/locationiq-provider": "^1.4",
-    "geocoder-php/mapbox-provider": "^1.4",
-    "geocoder-php/mapquest-provider": "^4.3",
-    "geocoder-php/mapzen-provider": "^4.0",
-    "geocoder-php/maxmind-binary-provider": "^4.3",
-    "geocoder-php/maxmind-provider": "^4.4",
-    "geocoder-php/nominatim-provider": "^5.6",
-    "geocoder-php/open-cage-provider": "^4.6",
-    "geocoder-php/openrouteservice-provider": "^1.3",
-    "geocoder-php/pickpoint-provider": "^4.3",
-    "geocoder-php/tomtom-provider": "^4.4",
-    "geocoder-php/yandex-provider": "^4.5",
+    "geocoder-php/algolia-places-provider": "^0.5",
+    "geocoder-php/arcgis-online-provider": "^4.5",
+    "geocoder-php/bing-maps-provider": "^4.4",
+    "geocoder-php/cache-provider": "^4.5.0",
+    "geocoder-php/chain-provider": "^4.6",
+    "geocoder-php/free-geoip-provider": "^4.6",
+    "geocoder-php/geo-plugin-provider": "^4.4",
+    "geocoder-php/geoip2-provider": "^4.4",
+    "geocoder-php/geonames-provider": "^4.5",
+    "geocoder-php/google-maps-places-provider": "^1.5",
+    "geocoder-php/google-maps-provider": "^4.8",
+    "geocoder-php/here-provider": "^0.8",
+    "geocoder-php/host-ip-provider": "^4.5",
+    "geocoder-php/ip-info-db-provider": "^4.4",
+    "geocoder-php/ip-info-provider": "^0.5",
+    "geocoder-php/ipstack-provider": "^0.5",
+    "geocoder-php/locationiq-provider": "^1.5",
+    "geocoder-php/mapbox-provider": "^1.5",
+    "geocoder-php/mapquest-provider": "^4.4",
+    "geocoder-php/maxmind-binary-provider": "^4.4",
+    "geocoder-php/maxmind-provider": "^4.5",
+    "geocoder-php/nominatim-provider": "^5.8",
+    "geocoder-php/open-cage-provider": "^4.7",
+    "geocoder-php/openrouteservice-provider": "^1.4",
+    "geocoder-php/pickpoint-provider": "^4.4",
+    "geocoder-php/tomtom-provider": "^4.5",
+    "geocoder-php/yandex-provider": "^4.6",
     "geoip/geoip": "~1.17",
     "nyholm/nsa": "^1.3",
-    "nyholm/psr7": "^1.5",
-    "nyholm/symfony-bundle-test": "^2.0 || ^3.0",
+    "nyholm/psr7": "^1.8",
+    "nyholm/symfony-bundle-test": "^3.1.0",
     "php-http/message": "^1.13",
     "php-http/mock-client": "^1.6",
     "phpstan/phpstan": "^1.9.2",
     "psr/http-client": "^1.0",
-    "psr/simple-cache": "^1.0 || ^2.0",
-    "symfony/cache": "^5.4 || ^6.4 || ^7.0",
-    "symfony/config": "^5.4 || ^6.4 || ^7.0",
-    "symfony/phpunit-bridge": "^5.4 || ^6.4 || ^7.0",
-    "symfony/validator": "^5.4 || ^6.4 || ^7.0",
-    "symfony/var-exporter": "^5.4 || ^6.4 || ^7.0",
-    "symfony/yaml": "^5.4 || ^6.4 || ^7.0"
+    "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
+    "symfony/cache": "^6.4 || ^7.0",
+    "symfony/config": "^6.4 || ^7.0",
+    "symfony/phpunit-bridge": "^6.4 || ^7.0",
+    "symfony/validator": "^6.4 || ^7.0",
+    "symfony/var-exporter": "^6.4 || ^7.0",
+    "symfony/yaml": "^6.4 || ^7.0"
   },
   "conflict": {
     "geocoder-php/nominatim-provider": "<5.0"

doc/services.md

@@ -17,7 +17,6 @@ Here is a list of all provider factories and their options.
 | `Bazinga\GeocoderBundle\ProviderFactory\FreeGeoIpFactory` | httplug_client, base_url
 | `Bazinga\GeocoderBundle\ProviderFactory\GeoIP2Factory` | provider, database_filename, user_id, license_key, webservice_options, locales, provider_service
 | `Bazinga\GeocoderBundle\ProviderFactory\GeoipFactory` |
-| `Bazinga\GeocoderBundle\ProviderFactory\GeoIPsFactory` | httplug_client, api_key
 | `Bazinga\GeocoderBundle\ProviderFactory\GeonamesFactory` | httplug_client, username
 | `Bazinga\GeocoderBundle\ProviderFactory\GeoPluginFactory` | httplug_client
 | `Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory` | httplug_client, api_key, region
@@ -30,7 +29,6 @@ Here is a list of all provider factories and their options.
 | `Bazinga\GeocoderBundle\ProviderFactory\LocationIQFactory` | httplug_client, api_key
 | `Bazinga\GeocoderBundle\ProviderFactory\MapboxFactory` | httplug_client, api_key, country, mode
 | `Bazinga\GeocoderBundle\ProviderFactory\MapQuestFactory` | httplug_client, api_key, licensed
-| `Bazinga\GeocoderBundle\ProviderFactory\MapzenFactory` | httplug_client, api_key
 | `Bazinga\GeocoderBundle\ProviderFactory\MaxMindBinaryFactory` | dat_file, open_flag
 | `Bazinga\GeocoderBundle\ProviderFactory\MaxMindFactory` | httplug_client, api_key, endpoint
 | `Bazinga\GeocoderBundle\ProviderFactory\NominatimFactory` | httplug_client, root_url

phpunit.xml.dist

@@ -5,9 +5,9 @@
     backupGlobals="false"
     backupStaticAttributes="false"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
+    convertErrorsToExceptions="false"
+    convertNoticesToExceptions="false"
+    convertWarningsToExceptions="false"
     processIsolation="false"
     stopOnFailure="false"
     bootstrap="tests/bootstrap.php"
@@ -28,4 +28,5 @@
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>
+
 </phpunit>

src/BazingaGeocoderBundle.php

@@ -23,10 +23,7 @@
  */
 class BazingaGeocoderBundle extends Bundle
 {
-    /**
-     * @return void
-     */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 

src/DataCollector/GeocoderDataCollector.php

@@ -34,20 +34,14 @@ public function __construct()
         $this->data['providers'] = [];
     }
 
-    /**
-     * @return void
-     */
-    public function reset()
+    public function reset(): void
     {
         $this->instances = [];
         $this->data['queries'] = [];
         $this->data['providers'] = [];
     }
 
-    /**
-     * @return void
-     */
-    public function collect(Request $request, Response $response, ?\Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         if (!empty($this->data['queries'])) {
             // To avoid collection more that once.

tests/Command/GeocodeCommandTest.php

@@ -66,7 +66,12 @@ public function testExecute(): void
             ->willReturn([]);
 
         $app = new Application($kernel);
-        $app->add((new GeocodeCommand($geocoder))->setName('geocoder:geocode'));
+
+        if (method_exists($app, 'addCommand')) {
+            $app->addCommand((new GeocodeCommand($geocoder))->setName('geocoder:geocode'));
+        } else {
+            $app->add((new GeocodeCommand($geocoder))->setName('geocoder:geocode'));
+        }
 
         $command = $app->find('geocoder:geocode');