drop Symfony 3

Author: garak

.php_cs

@@ -6,10 +6,11 @@ $finder = PhpCsFixer\Finder::create()
 ;
 
 return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => true,
+        '@Symfony:risky' => true,
+        '@PHP71Migration:risky' => true,
     ])
     ->setFinder($finder)
 ;

.travis.yml

@@ -1,27 +1,19 @@
 language: php
 
-php:
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-    - nightly
-
 cache:
     directories:
         - $HOME/.composer/cache
 
-matrix:
+jobs:
     fast_finish: true
     include:
         - php: 7.1
           env: SYMFONY_VERSION=3.4.* SYMFONY_DEPRECATIONS_HELPER=strict COMPOSER_FLAGS="--prefer-lowest"
         - php: 7.3
           env: SYMFONY_VERSION=4.4.*
         - php: 7.4
-          env: SYMFONY_VERSION=5.0.* DEPENDENCIES=dev COMPOSER_FLAGS="--prefer-stable"
-    allow_failures:
-        - php: nightly
+          env: SYMFONY_VERSION=5.2.* DEPENDENCIES=dev COMPOSER_FLAGS="--prefer-stable"
+        - php: 8.0
 
 env:
     global:

composer.json

@@ -14,11 +14,12 @@
     "require": {
         "php": "^7.1",
         "opensoft/doctrine-postgres-types": "^1.3",
-        "symfony/config": "^3.4 || ^4.3 || ^5.0",
-        "symfony/dependency-injection": "^3.4 || ^4.3 || ^5.0",
-        "symfony/http-kernel": "^3.4 || ^4.3 || ^5.0"
+        "symfony/config": "^4.4 || ^5.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0",
+        "symfony/http-kernel": "^4.4 || ^5.0"
     },
     "require-dev":{
+        "dg/bypass-finals": "^1.3",
         "phpunit/phpunit": "^7.5 || ^8.5"
     },
     "autoload": {

phpunit.xml.dist

@@ -12,4 +12,8 @@
             <directory>./src</directory>
         </whitelist>
     </filter>
+    <!-- see https://www.tomasvotruba.cz/blog/2019/03/28/how-to-mock-final-classes-in-phpunit/ -->
+    <extensions>
+        <extension class="Garak\DoctrinePostgresTypesBundle\Tests\BypassFinalHook"/>
+    </extensions>
 </phpunit>

src/DependencyInjection/DoctrinePostgresTypesExtension.php

@@ -2,35 +2,32 @@
 
 namespace Garak\DoctrinePostgresTypesBundle\DependencyInjection;
 
+use Doctrine\DBAL\PostgresTypes\InetType;
+use Doctrine\DBAL\PostgresTypes\IntArrayType;
+use Doctrine\DBAL\PostgresTypes\TextArrayType;
+use Doctrine\DBAL\PostgresTypes\TsqueryType;
+use Doctrine\DBAL\PostgresTypes\TsvectorType;
+use Doctrine\DBAL\PostgresTypes\XmlType;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-/**
- * DoctrinePostgresTypesExtension.
- */
-class DoctrinePostgresTypesExtension extends Extension implements PrependExtensionInterface
+final class DoctrinePostgresTypesExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $config = [
             'dbal' => ['types' => [
-                'text_array' => 'Doctrine\DBAL\PostgresTypes\TextArrayType',
-                'int_array' => 'Doctrine\DBAL\PostgresTypes\IntArrayType',
-                'tsvector' => 'Doctrine\DBAL\PostgresTypes\TsvectorType',
-                'tsquery' => 'Doctrine\DBAL\PostgresTypes\TsqueryType',
-                'xml' => 'Doctrine\DBAL\PostgresTypes\XmlType',
-                'inet' => 'Doctrine\DBAL\PostgresTypes\InetType',
+                'text_array' => TextArrayType::class,
+                'int_array' => IntArrayType::class,
+                'tsvector' => TsvectorType::class,
+                'tsquery' => TsqueryType::class,
+                'xml' => XmlType::class,
+                'inet' => InetType::class,
             ]],
         ];
         $container->prependExtensionConfig('doctrine', $config);

src/DoctrinePostgresTypesBundle.php

@@ -4,6 +4,6 @@
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class DoctrinePostgresTypesBundle extends Bundle
+final class DoctrinePostgresTypesBundle extends Bundle
 {
 }

tests/BypassFinalHook.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Garak\DoctrinePostgresTypesBundle\Tests;
+
+use DG\BypassFinals;
+use PHPUnit\Runner\BeforeTestHook;
+
+final class BypassFinalHook implements BeforeTestHook
+{
+    public function executeBeforeTest(string $test): void
+    {
+        BypassFinals::enable();
+    }
+}

tests/DependencyInjection/DoctrinePostgresTypesExtensionTest.php

@@ -1,49 +1,45 @@
 <?php
 
-namespace Garak\DoctrinePostgresTypes\Tests\DependencyInjection;
+namespace Garak\DoctrinePostgresTypesBundle\Tests\DependencyInjection;
 
 use Garak\DoctrinePostgresTypesBundle\DependencyInjection\DoctrinePostgresTypesExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
-class DoctrinePostgresTypesExtensionTest extends TestCase
+final class DoctrinePostgresTypesExtensionTest extends TestCase
 {
-    public function testLoadFailure()
+    public function testLoadFailure(): void
     {
-        $container = $this->getMockBuilder(ContainerBuilder::class)
-            ->disableOriginalConstructor()->getMock();
+        $container = $this->createMock(ContainerBuilder::class);
         $extension = $this->createMock(DoctrinePostgresTypesExtension::class);
 
         $extension->load([[]], $container);
-        $this->assertFalse(false);
+        self::assertFalse(false);
     }
 
-    public function testLoadSetParameters()
+    public function testLoadSetParameters(): void
     {
-        $container = $this->getMockBuilder(ContainerBuilder::class)
-            ->disableOriginalConstructor()->getMock();
+        $container = $this->createMock(ContainerBuilder::class);
         $parameterBag = $this->getMockBuilder(ParameterBag::class)
             ->disableOriginalConstructor()->getMock();
 
-        $parameterBag->expects($this->any())->method('add');
-
-        $container->expects($this->any())->method('getParameterBag')->will($this->returnValue($parameterBag));
+        $parameterBag->method('add');
+        $container->method('getParameterBag')->willReturn($parameterBag);
 
         $extension = new DoctrinePostgresTypesExtension();
         $configs = [];
         $extension->load($configs, $container);
-        $this->assertTrue(true);
+        self::assertTrue(true);
     }
 
-    public function testPrepend()
+    public function testPrepend(): void
     {
-        $container = $this->getMockBuilder(ContainerBuilder::class)
-            ->disableOriginalConstructor()->getMock();
-        $container->expects($this->once())->method('prependExtensionConfig');
+        $container = $this->createMock(ContainerBuilder::class);
+        $container->expects(self::once())->method('prependExtensionConfig');
 
         $extension = new DoctrinePostgresTypesExtension();
         $extension->prepend($container);
-        $this->assertTrue(true);
+        self::assertTrue(true);
     }
 }

tests/DoctrinePostgresTypesBundleTest.php

@@ -5,11 +5,11 @@
 use Garak\DoctrinePostgresTypesBundle\DoctrinePostgresTypesBundle;
 use PHPUnit\Framework\TestCase;
 
-class DoctrinePostgresTypesBundleTest extends TestCase
+final class DoctrinePostgresTypesBundleTest extends TestCase
 {
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $bundle = new DoctrinePostgresTypesBundle();
-        $this->assertInstanceOf(DoctrinePostgresTypesBundle::class, $bundle);
+        self::assertInstanceOf(DoctrinePostgresTypesBundle::class, $bundle);
     }
 }