Remove deprecated provider factories

Author: norkunas

src/ProviderFactory/GeoIPsFactory.php

@@ -51,7 +51,7 @@ public function testCachePluginUsesIpFromFakeIpPlugin(): void
             }
 
             $kernel->addTestConfig(__DIR__.'/config/cache_symfony.yml');
-            $kernel->addTestConfig(__DIR__.'/config/geo_plugin_fakeip_with_cache_cn.yml');
+            $kernel->addTestConfig(__DIR__.'/config/fakeip_with_cache_cn.yml');
         }]);
         $kernel->setClearCacheAfterShutdown(false);
         $container = self::getContainer();
@@ -70,7 +70,7 @@ public function testCachePluginUsesIpFromFakeIpPlugin(): void
             }
 
             $kernel->addTestConfig(__DIR__.'/config/cache_symfony.yml');
-            $kernel->addTestConfig(__DIR__.'/config/geo_plugin_fakeip_with_cache_fr.yml');
+            $kernel->addTestConfig(__DIR__.'/config/fakeip_with_cache_fr.yml');
         }]);
         $kernel->setClearCacheAfterShutdown(false);
         $container = self::getContainer();

src/ProviderFactory/MapzenFactory.php

@@ -20,7 +20,6 @@
 use Geocoder\Provider\FreeGeoIp\FreeGeoIp;
 use Geocoder\Provider\Geoip\Geoip;
 use Geocoder\Provider\GeoIP2\GeoIP2;
-use Geocoder\Provider\GeoIPs\GeoIPs;
 use Geocoder\Provider\Geonames\Geonames;
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
@@ -33,7 +32,6 @@
 use Geocoder\Provider\LocationIQ\LocationIQ;
 use Geocoder\Provider\Mapbox\Mapbox;
 use Geocoder\Provider\MapQuest\MapQuest;
-use Geocoder\Provider\Mapzen\Mapzen;
 use Geocoder\Provider\MaxMind\MaxMind;
 use Geocoder\Provider\MaxMindBinary\MaxMindBinary;
 use Geocoder\Provider\Nominatim\Nominatim;
@@ -107,9 +105,6 @@ public function getProviders(): iterable
         yield [FreeGeoIp::class, ['empty', 'acme']];
         // yield [Geoip::class, ['empty']];
         yield [GeoIP2::class, ['acme']];
-        if (class_exists(GeoIPs::class)) {
-            yield [GeoIPs::class, ['acme']];
-        }
         yield [Geonames::class, ['acme']];
         yield [GeoPlugin::class, ['empty']];
         yield [GoogleMaps::class, ['empty']];
@@ -122,9 +117,6 @@ public function getProviders(): iterable
         yield [LocationIQ::class, ['acme']];
         yield [Mapbox::class, ['acme']];
         yield [MapQuest::class, ['acme']];
-        if (class_exists(Mapzen::class)) {
-            yield [Mapzen::class, ['acme']];
-        }
         yield [MaxMind::class, ['acme']];
         yield [MaxMindBinary::class, ['acme']];
         yield [Nominatim::class, ['empty', 'acme']];

tests/Functional/PluginInteractionTest.php

@@ -2,13 +2,13 @@
 bazinga_geocoder:
     # The local IP (127.0.0.1) will be replaced by the fake_ip
     # see https://github.com/geocoder-php/BazingaGeocoderBundle/blob/5.0.0/Resources/doc/index.md#fake-local-ip
-    fake_ip: 
+    fake_ip:
         local_ip: ::1
         ip: 123.123.123.128
         # this ip is in china
     providers:
         geoPlugin:
-            factory: Bazinga\GeocoderBundle\ProviderFactory\GeoPluginFactory
+            factory: Bazinga\GeocoderBundle\ProviderFactory\FreeGeoIpFactory
             cache: 'app.simple_cache'
             cache_lifetime: 42
-            cache_precision: ~
+            cache_precision: ~

tests/Functional/ProviderFactoryTest.php

@@ -2,13 +2,13 @@
 bazinga_geocoder:
     # The local IP (127.0.0.1) will be replaced by the fake_ip
     # see https://github.com/geocoder-php/BazingaGeocoderBundle/blob/5.0.0/Resources/doc/index.md#fake-local-ip
-    fake_ip: 
+    fake_ip:
         local_ip: ::1
         ip: 87.98.128.10
         # this ip is in france
     providers:
         geoPlugin:
-            factory: Bazinga\GeocoderBundle\ProviderFactory\GeoPluginFactory
+            factory: Bazinga\GeocoderBundle\ProviderFactory\FreeGeoIpFactory
             cache: 'app.simple_cache'
             cache_lifetime: 42
-            cache_precision: ~
+            cache_precision: ~

…nfig/geo_plugin_fakeip_with_cache_cn.yml …nctional/config/fakeip_with_cache_cn.ymltests/Functional/config/geo_plugin_fakeip_with_cache_cn.yml renamed to tests/Functional/config/fakeip_with_cache_cn.yml tests/Functional/config/geo_plugin_fakeip_with_cache_cn.yml renamed to tests/Functional/config/fakeip_with_cache_cn.yml

@@ -1,5 +1,3 @@
-%Bazinga\\GeocoderBundle\\ProviderFactory\\GeoIPsFactory is deprecated since 5.6, to be removed in 6.0%
-%Bazinga\\GeocoderBundle\\ProviderFactory\\MapzenFactory is deprecated since 5.6, to be removed in 6.0%
 %Since doctrine/doctrine-bundle 2.11: Not setting "enable_lazy_ghost_objects" to true is deprecated%
 %Not configuring a schema manager factory is deprecated. Use Doctrine\\DBAL\\Schema\\DefaultSchemaManagerFactory which is going to be the default in DBAL 4%
 %Doctrine\\DBAL\\Configuration::setSQLLogger is deprecated, use setMiddlewares\(\) and Logging\\Middleware instead%