From c64a5269aa4410c38f8ac13afe28eccf6b8401dc Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 11:54:29 +0100 Subject: [PATCH 1/5] chore: bump dev dependencies --- composer.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 4fd3b90..b156caa 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "doctrine/orm": "^2.20 || ^3.0", "fakerphp/faker": "^1.20", "friendsofphp/php-cs-fixer": "^3.13", - "geocoder-php/algolia-places-provider": "^0.4", + "geocoder-php/algolia-places-provider": "^0.5", "geocoder-php/arcgis-online-provider": "^4.4", "geocoder-php/bing-maps-provider": "^4.3", "geocoder-php/cache-provider": "^4.4.0", @@ -39,26 +39,26 @@ "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/here-provider": "^0.8", + "geocoder-php/host-ip-provider": "^4.5", "geocoder-php/ip-info-db-provider": "^4.3", - "geocoder-php/ip-info-provider": "^0.4", - "geocoder-php/ipstack-provider": "^0.4", + "geocoder-php/ip-info-provider": "^0.5", + "geocoder-php/ipstack-provider": "^0.5", "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/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/psr7": "^1.8", "nyholm/symfony-bundle-test": "^2.0 || ^3.0", "phpstan/phpstan": "^1.9.2", "psr/http-client": "^1.0", From 099a4ed14bf6076f7a49a49ce37babcd649dbffe Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 12:07:22 +0100 Subject: [PATCH 2/5] chore: remove unused + bump dev dependencies --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index b156caa..a877b9e 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,6 @@ "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", @@ -47,7 +46,6 @@ "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.4", "geocoder-php/maxmind-provider": "^4.5", "geocoder-php/nominatim-provider": "^5.8", @@ -56,7 +54,6 @@ "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.8", "nyholm/symfony-bundle-test": "^2.0 || ^3.0", From 2376a16a631f02f1bcd7c95d55e7e5f7c663c340 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 12:27:49 +0100 Subject: [PATCH 3/5] chore: remove unused + bump dev dependencies --- doc/services.md | 2 - phpstan-baseline.php | 90 +++++++++------------- src/ProviderFactory/GeoipFactory.php | 36 --------- tests/Functional/config/provider/geoip.yml | 6 -- 4 files changed, 38 insertions(+), 96 deletions(-) delete mode 100644 src/ProviderFactory/GeoipFactory.php delete mode 100644 tests/Functional/config/provider/geoip.yml diff --git a/doc/services.md b/doc/services.md index 8335baf..1489b3f 100644 --- a/doc/services.md +++ b/doc/services.md @@ -16,8 +16,6 @@ Here is a list of all provider factories and their options. | `Bazinga\GeocoderBundle\ProviderFactory\ChainFactory` | services | `Bazinga\GeocoderBundle\ProviderFactory\FreeGeoIpFactory` | http_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` | http_client, api_key | `Bazinga\GeocoderBundle\ProviderFactory\GeonamesFactory` | http_client, username | `Bazinga\GeocoderBundle\ProviderFactory\GeoPluginFactory` | http_client | `Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory` | http_client, api_key, region diff --git a/phpstan-baseline.php b/phpstan-baseline.php index a833970..e9275bf 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1,211 +1,197 @@ - '#^Parameter \\#1 \\$name of method Geocoder\\\\ProviderAggregator\\:\\:using\\(\\) expects string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/Command/GeocodeCommand.php', + 'path' => __DIR__ . '/src/Command/GeocodeCommand.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$string of function strtolower expects string, string\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/Command/GeocodeCommand.php', + 'path' => __DIR__ . '/src/Command/GeocodeCommand.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$text of static method Geocoder\\\\Query\\\\GeocodeQuery\\:\\:create\\(\\) expects string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/Command/GeocodeCommand.php', + 'path' => __DIR__ . '/src/Command/GeocodeCommand.php', +]; +$ignoreErrors[] = [ + // identifier: argument.type + 'message' => '#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/src/Command/GeocodeCommand.php', ]; $ignoreErrors[] = [ // identifier: foreach.nonIterable 'message' => '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#', 'count' => 3, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: offsetAccess.nonOffsetAccessible 'message' => '#^Cannot access offset \'aliases\' on mixed\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: offsetAccess.nonOffsetAccessible 'message' => '#^Cannot access offset \'enabled\' on mixed\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: offsetAccess.nonOffsetAccessible 'message' => '#^Cannot access offset \'factory\' on mixed\\.$#', 'count' => 5, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: offsetAccess.nonOffsetAccessible 'message' => '#^Cannot access offset \'id\' on mixed\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: offsetAccess.nonOffsetAccessible 'message' => '#^Cannot access offset \'options\' on mixed\\.$#', 'count' => 4, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: offsetAccess.nonOffsetAccessible 'message' => '#^Cannot access offset \'reference\' on mixed\\.$#', 'count' => 2, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: staticMethod.nonObject 'message' => '#^Cannot call static method validate\\(\\) on mixed\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: cast.string 'message' => '#^Cannot cast mixed to string\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$alias of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder\\:\\:setAlias\\(\\) expects string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: Symfony\\\\Component\\\\DependencyInjection\\\\Reference given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$factoryServiceId of static method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\Compiler\\\\FactoryValidatorPass\\:\\:addFactoryServiceId\\(\\) expects string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$id of class Symfony\\\\Component\\\\DependencyInjection\\\\Reference constructor expects string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$id of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder\\:\\:getDefinition\\(\\) expects string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$object_or_class of function class_implements expects object\\|string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$options of method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\BazingaGeocoderExtension\\:\\:findReferences\\(\\) expects array\\, mixed given\\.$#', 'count' => 2, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$string of function ltrim expects string, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#2 \\$config of method Bazinga\\\\GeocoderBundle\\\\DependencyInjection\\\\BazingaGeocoderExtension\\:\\:configureProviderPlugins\\(\\) expects array\\, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: encapsedStringPart.nonString 'message' => '#^Part \\$providerName \\(mixed\\) of encapsed string cannot be cast to string\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/DependencyInjection/BazingaGeocoderExtension.php', + 'path' => __DIR__ . '/src/DependencyInjection/BazingaGeocoderExtension.php', ]; $ignoreErrors[] = [ // identifier: method.nonObject 'message' => '#^Cannot call method getLatitude\\(\\) on Geocoder\\\\Model\\\\Coordinates\\|null\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/Doctrine/ORM/GeocoderListener.php', + 'path' => __DIR__ . '/src/Doctrine/ORM/GeocoderListener.php', ]; $ignoreErrors[] = [ // identifier: method.nonObject 'message' => '#^Cannot call method getLongitude\\(\\) on Geocoder\\\\Model\\\\Coordinates\\|null\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/Doctrine/ORM/GeocoderListener.php', + 'path' => __DIR__ . '/src/Doctrine/ORM/GeocoderListener.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$text of method Geocoder\\\\Query\\\\GeocodeQuery\\:\\:withText\\(\\) expects string, string\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/Plugin/FakeIpPlugin.php', + 'path' => __DIR__ . '/src/Plugin/FakeIpPlugin.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#2 \\$replace of function str_replace expects array\\|string, string\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/Plugin/FakeIpPlugin.php', + 'path' => __DIR__ . '/src/Plugin/FakeIpPlugin.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$accountId of class GeoIp2\\\\WebService\\\\Client constructor expects int, int\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php', + 'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$filename of class GeoIp2\\\\Database\\\\Reader constructor expects string, string\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php', + 'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$geoIpProvider of class Geocoder\\\\Provider\\\\GeoIP2\\\\GeoIP2Adapter constructor expects GeoIp2\\\\ProviderInterface, GeoIp2\\\\ProviderInterface\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php', + 'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php', ]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#2 \\$licenseKey of class GeoIp2\\\\WebService\\\\Client constructor expects string, string\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__.'/src/ProviderFactory/GeoIP2Factory.php', -]; -$ignoreErrors[] = [ - // identifier: class.notFound - 'message' => '#^Class Geocoder\\\\Provider\\\\Geoip\\\\Geoip not found\\.$#', - 'count' => 1, - 'path' => __DIR__.'/src/ProviderFactory/GeoipFactory.php', -]; -$ignoreErrors[] = [ - // identifier: class.notFound - 'message' => '#^Instantiated class Geocoder\\\\Provider\\\\Geoip\\\\Geoip not found\\.$#', - 'count' => 1, - 'path' => __DIR__.'/src/ProviderFactory/GeoipFactory.php', -]; -$ignoreErrors[] = [ - // identifier: return.type - 'message' => '#^Method Bazinga\\\\GeocoderBundle\\\\ProviderFactory\\\\GeoipFactory\\:\\:getProvider\\(\\) should return Geocoder\\\\Provider\\\\Provider but returns Geocoder\\\\Provider\\\\Geoip\\\\Geoip\\.$#', - 'count' => 1, - 'path' => __DIR__.'/src/ProviderFactory/GeoipFactory.php', + 'path' => __DIR__ . '/src/ProviderFactory/GeoIP2Factory.php', ]; return ['parameters' => ['ignoreErrors' => $ignoreErrors]]; diff --git a/src/ProviderFactory/GeoipFactory.php b/src/ProviderFactory/GeoipFactory.php deleted file mode 100644 index 03a874a..0000000 --- a/src/ProviderFactory/GeoipFactory.php +++ /dev/null @@ -1,36 +0,0 @@ - Geoip::class, 'packageName' => 'geocoder-php/geoip-provider'], - ]; - - /** - * @param array{} $config - */ - protected function getProvider(array $config): Provider - { - return new Geoip(); - } - - protected static function configureOptionResolver(OptionsResolver $resolver) - { - } -} diff --git a/tests/Functional/config/provider/geoip.yml b/tests/Functional/config/provider/geoip.yml deleted file mode 100644 index 2ede9cd..0000000 --- a/tests/Functional/config/provider/geoip.yml +++ /dev/null @@ -1,6 +0,0 @@ -bazinga_geocoder: - profiling: - enabled: false - providers: - empty: - factory: Bazinga\GeocoderBundle\ProviderFactory\GeoipFactory From 92a7fa7c447664ca8cb9542ca4829c67f7abebb6 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 12:34:01 +0100 Subject: [PATCH 4/5] chore: remove unused + bump dev dependencies --- .php-cs-fixer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index f22e0df..11bd713 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -3,6 +3,7 @@ $finder = (new PhpCsFixer\Finder()) ->in(__DIR__) ->exclude(__DIR__.'/vendor') + ->exclude(__DIR__.'/phpstan-baseline.php') ; return (new PhpCsFixer\Config()) From 157976f65a3a2f87eb43a5d8a959ab19ec8cfd13 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 12:38:28 +0100 Subject: [PATCH 5/5] chore: remove unused + bump dev dependencies --- .php-cs-fixer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 11bd713..5f704ff 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -3,7 +3,7 @@ $finder = (new PhpCsFixer\Finder()) ->in(__DIR__) ->exclude(__DIR__.'/vendor') - ->exclude(__DIR__.'/phpstan-baseline.php') + ->notPath('phpstan-baseline.php') ; return (new PhpCsFixer\Config())