Remove deprecated provider factories

Author: norkunas

tests/Functional/PluginInteractionTest.php

@@ -14,7 +14,12 @@
 
 use Bazinga\GeocoderBundle\BazingaGeocoderBundle;
 use Geocoder\Query\GeocodeQuery;
+use Http\Message\RequestMatcher\RequestMatcher;
+use Http\Mock\Client;
 use Nyholm\BundleTest\TestKernel;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -56,6 +61,28 @@ public function testCachePluginUsesIpFromFakeIpPlugin(): void
         $kernel->setClearCacheAfterShutdown(false);
         $container = self::getContainer();
 
+        $httpClient = $container->get(Client::class);
+        $httpClient->on(new RequestMatcher(), function (RequestInterface $request) {
+            if ('https://freegeoip.app/json/123.123.123.128' === (string) $request->getUri()) {
+                $stream = $this->createMock(StreamInterface::class);
+                $stream->expects(self::once())
+                    ->method('__toString')
+                    ->willReturn('{"ip":"123.123.123.128","country_code":"CN","country_name":"China","region_code":"CN-BJ","region_name":"Beijing","city":"Beijing","zip_code":"100006","time_zone":"Asia\/Shanghai","latitude":39.907501220703125,"longitude":116.39710235595703,"metro_code":0}');
+
+                $response = $this->createMock(ResponseInterface::class);
+                $response->expects(self::once())
+                    ->method('getStatusCode')
+                    ->willReturn(200);
+                $response->expects(self::once())
+                    ->method('getBody')
+                    ->willReturn($stream);
+
+                return $response;
+            }
+
+            self::fail(sprintf('Unexpected http call "%s %s".', $request->getMethod(), (string) $request->getUri()));
+        });
+
         $geoPluginGeocoder = $container->get('bazinga_geocoder.provider.geoPlugin');
         $result = $geoPluginGeocoder->geocodeQuery(GeocodeQuery::create('::1'));
         $country = $result->first()->getCountry()->getCode();
@@ -75,6 +102,28 @@ public function testCachePluginUsesIpFromFakeIpPlugin(): void
         $kernel->setClearCacheAfterShutdown(false);
         $container = self::getContainer();
 
+        $httpClient = $container->get(Client::class);
+        $httpClient->on(new RequestMatcher(), function (RequestInterface $request) {
+            if ('https://freegeoip.app/json/87.98.128.10' === (string) $request->getUri()) {
+                $stream = $this->createMock(StreamInterface::class);
+                $stream->expects(self::once())
+                    ->method('__toString')
+                    ->willReturn('{"ip":"87.98.128.10","country_code":"FR","country_name":"France","region_code":null,"region_name":"Nord","city":"Roubaix","zip_code":"59100","time_zone":"Europe\/Paris","latitude":50.69371032714844,"longitude":3.174438953399658,"metro_code":0}');
+
+                $response = $this->createMock(ResponseInterface::class);
+                $response->expects(self::once())
+                    ->method('getStatusCode')
+                    ->willReturn(200);
+                $response->expects(self::once())
+                    ->method('getBody')
+                    ->willReturn($stream);
+
+                return $response;
+            }
+
+            self::fail(sprintf('Unexpected http call "%s %s".', $request->getMethod(), (string) $request->getUri()));
+        });
+
         $geoPluginGeocoder = $container->get('bazinga_geocoder.provider.geoPlugin');
         $result = $geoPluginGeocoder->geocodeQuery(GeocodeQuery::create('::1'));
         $country = $result->first()->getCountry()->getCode();

tests/Functional/config/fakeip_with_cache_cn.yml

@@ -12,3 +12,8 @@ bazinga_geocoder:
             cache: 'app.simple_cache'
             cache_lifetime: 42
             cache_precision: ~
+            options:
+                http_client: '@Http\Mock\Client'
+
+services:
+    Http\Mock\Client: ~

tests/Functional/config/fakeip_with_cache_fr.yml

@@ -12,3 +12,8 @@ bazinga_geocoder:
             cache: 'app.simple_cache'
             cache_lifetime: 42
             cache_precision: ~
+            options:
+                http_client: '@Http\Mock\Client'
+
+services:
+    Http\Mock\Client: ~