Merge pull request #363 from norkunas/geocoder5support

norkunas · web-flow · commit 8826cfe6d4cd · 2025-04-30T21:37:49.000+03:00
Allow `willdurand/geocoder` v5
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "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"
+    "willdurand/geocoder": "^4.6|^5.0"
   },
   "require-dev": {
     "doctrine/annotations": "^1.11.1 || ^2.0",
diff --git a/src/ProviderFactory/GeoIP2Factory.php b/src/ProviderFactory/GeoIP2Factory.php
@@ -27,7 +27,7 @@ final class GeoIP2Factory extends AbstractFactory
     ];
 
     /**
-     * @param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string|int|null, license_key: string|null, locales: list<string>, webservice_options: array<mixed, mixed>, database_filename: ?string} $config
+     * @param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string|int|null, license_key: string|null, locales: list<string>, webservice_options: array<string, mixed>, database_filename: ?string} $config
      */
     protected function getProvider(array $config): Provider
     {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ final class GeoIP2Factory extends AbstractFactory`
`27`	`27`	`];`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string\|int\|null, license_key: string\|null, locales: list<string>, webservice_options: array<mixed, mixed>, database_filename: ?string} $config`
	`30`	`+ * @param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string\|int\|null, license_key: string\|null, locales: list<string>, webservice_options: array<string, mixed>, database_filename: ?string} $config`
`31`	`31`	`*/`
`32`	`32`	`protected function getProvider(array $config): Provider`
`33`	`33`	`{`