Merge pull request #319 from norkunas/sf6

Allow Symfony 6
geocoder-php · Dec 14, 2021 · c9318d5 · c9318d5
2 parents b9a62fd + b19dee6
commit c9318d5
Show file tree

Hide file tree

Showing 25 changed files with 298 additions and 201 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,8 +53,22 @@ jobs:
             max-parallel: 10
             fail-fast: true
             matrix:
-                php: ['7.3', '7.4', '8.0']
-                sf_version: ['4.4.*', '5.2.*', '5.3.*']
+                strategy: ['default']
+                php: ['7.3', '7.4', '8.0', '8.1']
+                include:
+                    - php: '7.3'
+                      sf_version: '4.4.*'
+                      strategy: 'lowest'
+                    - php: '7.4'
+                      sf_version: '5.4.*'
+                    - php: '8.0'
+                      sf_version: '5.4.*'
+                    - php: '8.1'
+                      sf_version: '5.4.*'
+                    - php: '8.0'
+                      sf_version: '6.0.*'
+                    - php: '8.1'
+                      sf_version: '6.0.*'
         steps:
             - name: "Setup PHP"
               uses: shivammathur/setup-php@v2
@@ -66,37 +80,14 @@ jobs:
             - name: "Checkout code"
               uses: actions/checkout@v2
 
-            - name: "Install Composer dependencies"
+            - name: "Install Composer dependencies (default)"
+              if: matrix.strategy != 'lowest'
               env:
                   SYMFONY_REQUIRE: ${{ matrix.sf_version }}
               run: composer update --no-interaction --optimize-autoloader
 
-            - name: "Run tests"
-              env:
-                  SYMFONY_DEPRECATIONS_HELPER: 'max[self]=2'
-              run: ./vendor/bin/simple-phpunit -v --testsuite main
-
-    phpunit-lowest:
-        name: "PHPUnit (Lowest)"
-        runs-on: ubuntu-latest
-        strategy:
-            max-parallel: 10
-            fail-fast: true
-            matrix:
-                php: ['7.4']
-                sf_version: ['4.4.*', '5.2.*', '5.3.*']
-        steps:
-            - name: "Setup PHP"
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  tools: composer:v2, flex
-                  coverage: none
-
-            - name: "Checkout code"
-              uses: actions/checkout@v2
-
-            - name: "Install Composer dependencies"
+            - name: "Install Composer dependencies (lowest)"
+              if: matrix.strategy == 'lowest'
               env:
                   SYMFONY_REQUIRE: ${{ matrix.sf_version }}
               run: composer update --no-interaction --prefer-stable --prefer-lowest --optimize-autoloader
@@ -113,8 +104,20 @@ jobs:
             max-parallel: 10
             fail-fast: true
             matrix:
-                php: ['7.3', '7.4', '8.0']
-                sf_version: ['4.4.*', '5.2.*', '5.3.*']
+                php: ['7.4', '8.0', '8.1']
+                include:
+                    - php: '7.4'
+                      sf_version: '4.4.*'
+                    - php: '7.4'
+                      sf_version: '5.4.*'
+                    - php: '8.0'
+                      sf_version: '5.4.*'
+                    - php: '8.1'
+                      sf_version: '5.4.*'
+                    - php: '8.0'
+                      sf_version: '6.0.*'
+                    - php: '8.1'
+                      sf_version: '6.0.*'
         steps:
             - name: "Setup PHP"
               uses: shivammathur/setup-php@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 The changelog describes what have been "Added", "Changed", "Removed" or "Fixed" between versions.
 
+## Version 5.16.1
+
+### Fixed
+
+- Allow Symfony 6
+
 ## Version 5.16.0
 
 ### Added

diff --git a/Command/GeocodeCommand.php b/Command/GeocodeCommand.php
@@ -62,6 +62,8 @@ protected function configure()
 
     /**
      * {@inheritdoc}
+     *
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

diff --git a/DependencyInjection/BazingaGeocoderExtension.php b/DependencyInjection/BazingaGeocoderExtension.php
@@ -59,7 +59,7 @@ public function load(array $configs, ContainerBuilder $container)
             $definition->replaceArgument(2, $config['fake_ip']['use_faker']);
 
             if ($config['fake_ip']['use_faker'] && !class_exists(Generator::class)) {
-                throw new \LogicException('To enable this option, you must install fzaninotto/faker package.');
+                throw new \LogicException('To enable this option, you must install fakerphp/faker package.');
             }
         } else {
             $container->removeDefinition(FakeIpPlugin::class);
@@ -173,7 +173,7 @@ public function configureProviderPlugins(ContainerBuilder $container, array $con
     }
 
     /**
-     * {@inheritdoc}
+     * @return Configuration
      */
     public function getConfiguration(array $config, ContainerBuilder $container)
     {

diff --git a/Doctrine/ORM/GeocoderListener.php b/Doctrine/ORM/GeocoderListener.php
@@ -44,6 +44,8 @@ public function __construct(Provider $geocoder, DriverInterface $driver)
 
     /**
      * {@inheritdoc}
+     *
+     * @return array
      */
     public function getSubscribedEvents()
     {

diff --git a/Plugin/FakeIpPlugin.php b/Plugin/FakeIpPlugin.php
@@ -17,6 +17,7 @@
 use Geocoder\Plugin\Plugin;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\Query;
+use Http\Promise\Promise;
 
 /**
  * Replace local IP with something better.
@@ -52,7 +53,7 @@ public function __construct(?string $needle, string $replacement = null, bool $u
     }
 
     /**
-     * {@inheritdoc}
+     * @return Promise
      */
     public function handleQuery(Query $query, callable $next, callable $first)
     {

diff --git a/Plugin/ProfilingPlugin.php b/Plugin/ProfilingPlugin.php
@@ -19,6 +19,7 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\Query;
 use Geocoder\Query\ReverseQuery;
+use Http\Promise\Promise;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -40,6 +41,9 @@ public function __construct(string $name)
         $this->name = $name;
     }
 
+    /**
+     * @return Promise
+     */
     public function handleQuery(Query $query, callable $next, callable $first)
     {
         $startTime = microtime(true);

diff --git a/Resources/doc/index.md b/Resources/doc/index.md
@@ -215,7 +215,7 @@ bazinga_geocoder:
         ip: 123.123.123.123
 ```
 
-You can also let [Faker](https://github.com/fzaninotto/Faker) generate fake ip for you.
+You can also let [Faker](https://github.com/fakerphp/faker) generate fake ip for you.
 
 ```yaml
 bazinga_geocoder:

diff --git a/Tests/Command/GeocodeCommandTest.php b/Tests/Command/GeocodeCommandTest.php
@@ -32,7 +32,7 @@ class GeocodeCommandTest extends TestCase
 {
     private static $address = '10 rue Gambetta, Paris, France';
 
-    public function testExecute()
+    public function testExecute(): void
     {
         $coordinates = new Coordinates(1, 2);
         $country = new Country('France', 'FR');
@@ -59,7 +59,7 @@ public function testExecute()
 
         $kernel->expects($this->any())
             ->method('getContainer')
-            ->will($this->returnValue($container));
+            ->willReturn($container);
 
         $kernel->expects($this->any())
             ->method('getBundles')

diff --git a/Tests/DependencyInjection/Compiler/AddProvidersPassTest.php b/Tests/DependencyInjection/Compiler/AddProvidersPassTest.php
@@ -17,25 +17,22 @@
 use Geocoder\ProviderAggregator;
 use Http\Client\Curl\Client;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
 class AddProvidersPassTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @var AddProvidersPass
      */
     private $compilerPass;
 
-    protected function doSetUp()
+    protected function setUp(): void
     {
         $this->compilerPass = new AddProvidersPass();
     }
 
-    public function testRegistersProviders()
+    public function testRegistersProviders(): void
     {
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->setDefinition(ProviderAggregator::class, new Definition(ProviderAggregator::class));

diff --git a/Tests/DependencyInjection/Compiler/FactoryValidatorPassTest.php b/Tests/DependencyInjection/Compiler/FactoryValidatorPassTest.php
@@ -14,14 +14,11 @@
 
 use Bazinga\GeocoderBundle\DependencyInjection\Compiler\FactoryValidatorPass;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 class FactoryValidatorPassTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @var FactoryValidatorPass
      */
@@ -32,22 +29,22 @@ class FactoryValidatorPassTest extends TestCase
      */
     private $factoryId;
 
-    protected function doSetUp()
+    protected function setUp(): void
     {
         $this->compilerPass = new FactoryValidatorPass();
         $this->factoryId = 'dummy_factory_id';
         $this->compilerPass::addFactoryServiceId($this->factoryId);
     }
 
-    protected function doTearDown()
+    protected function tearDown(): void
     {
         $reflection = new \ReflectionObject($this->compilerPass);
         $prop = $reflection->getProperty('factoryServiceIds');
         $prop->setAccessible(true);
         $prop->setValue([]);
     }
 
-    public function testProcessThrows()
+    public function testProcessThrows(): void
     {
         $this->expectException(ServiceNotFoundException::class);
         $this->expectExceptionMessage("Factory with ID \"$this->factoryId\" could not be found");
@@ -65,7 +62,7 @@ public function testProcessThrows()
         $this->compilerPass->process($container);
     }
 
-    public function testProcessDoesntThrowIfAliasExists()
+    public function testProcessDoesntThrowIfAliasExists(): void
     {
         $container = $this->createMock(ContainerBuilder::class);
         $container->expects($this->once())
@@ -80,7 +77,7 @@ public function testProcessDoesntThrowIfAliasExists()
         $this->compilerPass->process($container);
     }
 
-    public function testProcessDoesntThrowIfDefinitionExists()
+    public function testProcessDoesntThrowIfDefinitionExists(): void
     {
         $container = $this->createMock(ContainerBuilder::class);
         $container->expects($this->once())

diff --git a/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -16,26 +16,23 @@
 use Bazinga\GeocoderBundle\DependencyInjection\Compiler\ProfilerPass;
 use Bazinga\GeocoderBundle\Plugin\ProfilingPlugin;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
 class ProfilerPassTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @var ProfilerPass
      */
     private $compilerPass;
 
-    protected function doSetUp()
+    protected function setUp(): void
     {
         $this->compilerPass = new ProfilerPass();
     }
 
-    public function testRegistersProviders()
+    public function testRegistersProviders(): void
     {
         $geocoderDataCollectorDefinition = new Definition(GeocoderDataCollector::class);
 

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -22,7 +22,7 @@
  */
 class ConfigurationTest extends TestCase
 {
-    public function testGetConfigTreeBuilder()
+    public function testGetConfigTreeBuilder(): void
     {
         $config = Yaml::parse(file_get_contents(__DIR__.'/Fixtures/config.yml'));
 
@@ -38,7 +38,7 @@ public function testGetConfigTreeBuilder()
         $this->assertSame('33.33.33.11', $config['fake_ip']['ip']);
     }
 
-    public function testGetConfigTreeBuilderNoDebug()
+    public function testGetConfigTreeBuilderNoDebug(): void
     {
         $config = Yaml::parse(file_get_contents(__DIR__.'/Fixtures/config.yml'));
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,8 @@ protected function configure() @@
         /**
          * {@inheritdoc}
+         *
+         * @return int
          */
         protected function execute(InputInterface $input, OutputInterface $output)
         {
@@ Expand Down @@