Allow Symfony 6 and PHP 8

cocur · Dec 17, 2021 · f1ac25b · f1ac25b
1 parent ec3efc2
commit f1ac25b
Show file tree

Hide file tree

Showing 23 changed files with 124 additions and 78 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,6 +10,7 @@ cache:
 
 init:
   - SET PATH=C:\tools\php;%PATH%
+  - SET COMPOSER_BINARY=C:\tools\composer.phar
 
 install:
   - ps: Set-Service wuauserv -StartupType Manual
@@ -24,9 +25,8 @@ install:
   - echo memory_limit=3G >> php.ini
   - IF NOT EXIST C:\tools\composer.phar (cd C:\tools && appveyor DownloadFile https://getcomposer.org/composer.phar)
   - cd %APPVEYOR_BUILD_FOLDER%
-  - php C:\tools\composer.phar global show hirak/prestissimo --quiet || php C:\tools\composer.phar global require hirak/prestissimo --no-progress
-  - php C:\tools\composer.phar update --no-ansi --no-interaction --no-progress --no-suggest --optimize-autoloader --prefer-stable
+  - php C:\tools\composer.phar update --no-interaction --no-progress --optimize-autoloader --prefer-stable
 
 test_script:
   - cd %APPVEYOR_BUILD_FOLDER%
-  - php vendor\phpunit\phpunit\phpunit
+  - php vendor\bin\simple-phpunit
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/
 /.php_cs.cache
+.phpunit.result.cache
 /composer.lock
 /phpunit.xml
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,6 @@ language: php
 
 matrix:
   include:
-    - php: 7.0
-    - php: 7.0
-      env: COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.1
     - php: 7.1
       env: COMPOSER_FLAGS='--prefer-lowest'
@@ -17,9 +14,15 @@ matrix:
     - php: 7.3
       env: COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.4
-      env: ANALYSIS=1
     - php: 7.4
       env: COMPOSER_FLAGS='--prefer-lowest'
+    - php: 8.0
+    - php: 8.0
+      env: COMPOSER_FLAGS='--prefer-lowest'
+    - php: 8.1
+      env: ANALYSIS=1
+    - php: 8.1
+      env: COMPOSER_FLAGS='--prefer-lowest'
     - php: nightly
   allow_failures:
     - php: nightly
@@ -34,7 +37,7 @@ install:
   - if [ $ANALYSIS == 1 ]; then travis_retry composer update --working-dir=./dev-tools --no-suggest; fi
 
 script:
-  - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover
+  - vendor/bin/simple-phpunit --verbose --coverage-clover=coverage.clover
   - if [ $ANALYSIS == 1 ]; then ./dev-tools/analyse.sh || travis_terminate 1; fi
 
 after_script:

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": ">=7.1",
         "ext-mbstring": "*"
     },
     "conflict": {
@@ -35,12 +35,12 @@
         "mikey179/vfsstream": "~1.6.8",
         "mockery/mockery": "^1.3",
         "nette/di": "~2.4",
-        "phpunit/phpunit": "^5.7.27",
         "pimple/pimple": "~1.1",
         "plumphp/plum": "~0.1",
-        "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": "^3.4 || ^4.3 || ^5.0 || ^6.0",
+        "symfony/dependency-injection": "^3.4 || ^4.3 || ^5.0 || ^6.0",
+        "symfony/http-kernel": "^3.4 || ^4.3 || ^5.0 || ^6.0",
+        "symfony/phpunit-bridge": "^5.4 || ^6.0",
         "twig/twig": "^2.12.1 || ~3.0",
         "zendframework/zend-modulemanager": "~2.2",
         "zendframework/zend-servicemanager": "~2.2",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit bootstrap="vendor/autoload.php" colors="true">
+    <php>
+        <!-- Baseline Deprecations https://symfony.com/doc/current/components/phpunit_bridge.html#baseline-deprecations -->
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="baselineFile=./tests/allowed.json&amp;max[direct]=0" />
+    </php>
+
     <testsuites>
         <testsuite name="cocur/slugify Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <listeners>
         <listener class="\Mockery\Adapter\Phpunit\TestListener" />
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>
 </phpunit>
diff --git a/src/Bridge/League/SlugifyServiceProvider.php b/src/Bridge/League/SlugifyServiceProvider.php
@@ -14,7 +14,7 @@ class SlugifyServiceProvider extends AbstractServiceProvider
         SlugifyInterface::class,
     ];
 
-    public function register()
+    public function register(): void
     {
         $this->container->share(SlugifyInterface::class, function () {
             $options = [];

diff --git a/src/Bridge/Nette/SlugifyExtension.php b/src/Bridge/Nette/SlugifyExtension.php
@@ -15,7 +15,7 @@
  */
 class SlugifyExtension extends CompilerExtension
 {
-    public function loadConfiguration()
+    public function loadConfiguration(): void
     {
         $builder = $this->getContainerBuilder();
 
@@ -28,7 +28,7 @@ public function loadConfiguration()
             ->setAutowired(false);
     }
 
-    public function beforeCompile()
+    public function beforeCompile(): void
     {
         $builder = $this->getContainerBuilder();
 

diff --git a/src/Bridge/Symfony/CocurSlugifyBundle.php b/src/Bridge/Symfony/CocurSlugifyBundle.php
@@ -11,6 +11,7 @@
 
 namespace Cocur\Slugify\Bridge\Symfony;
 
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -24,7 +25,7 @@
  */
 class CocurSlugifyBundle extends Bundle
 {
-    public function getContainerExtension()
+    public function getContainerExtension(): ExtensionInterface
     {
         return new CocurSlugifyExtension();
     }

diff --git a/src/Bridge/Symfony/CocurSlugifyExtension.php b/src/Bridge/Symfony/CocurSlugifyExtension.php
@@ -11,6 +11,9 @@
 
 namespace Cocur\Slugify\Bridge\Symfony;
 
+use Cocur\Slugify\Bridge\Twig\SlugifyExtension;
+use Cocur\Slugify\Slugify;
+use Cocur\Slugify\SlugifyInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -33,7 +36,7 @@ class CocurSlugifyExtension extends Extension
      * @param mixed[]          $configs
      * @param ContainerBuilder $container
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
@@ -45,18 +48,18 @@ public function load(array $configs, ContainerBuilder $container)
         // Extract slugify arguments from config
         $slugifyArguments = array_intersect_key($config, array_flip(['lowercase', 'trim', 'strip_tags', 'separator', 'regexp', 'rulesets']));
 
-        $container->setDefinition('cocur_slugify', new Definition('Cocur\Slugify\Slugify', [$slugifyArguments]));
+        $container->setDefinition('cocur_slugify', new Definition(Slugify::class, [$slugifyArguments]));
         $container
             ->setDefinition(
                 'cocur_slugify.twig.slugify',
                 new Definition(
-                    'Cocur\Slugify\Bridge\Twig\SlugifyExtension',
+                    SlugifyExtension::class,
                     [new Reference('cocur_slugify')]
                 )
             )
             ->addTag('twig.extension')
             ->setPublic(false);
         $container->setAlias('slugify', 'cocur_slugify');
-        $container->setAlias('Cocur\Slugify\SlugifyInterface', 'cocur_slugify');
+        $container->setAlias(SlugifyInterface::class, 'cocur_slugify');
     }
 }
diff --git a/src/Bridge/Symfony/Configuration.php b/src/Bridge/Symfony/Configuration.php
@@ -19,7 +19,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('cocur_slugify');
 

diff --git a/tests/Bridge/Laravel/SlugifyProviderTest.php b/tests/Bridge/Laravel/SlugifyProviderTest.php
@@ -35,7 +35,7 @@ class SlugifyProviderTest extends MockeryTestCase
     /** @var SlugifyServiceProvider */
     private $provider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->app = new Application();
         $this->provider = new SlugifyServiceProvider($this->app);

diff --git a/tests/Bridge/Latte/SlugifyHelperTest.php b/tests/Bridge/Latte/SlugifyHelperTest.php
@@ -18,7 +18,7 @@
  */
 class SlugifyHelperTest extends MockeryTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->slugify = m::mock('Cocur\Slugify\SlugifyInterface');
         $this->helper = new SlugifyHelper($this->slugify);

diff --git a/tests/Bridge/League/SlugifyServiceProviderTest.php b/tests/Bridge/League/SlugifyServiceProviderTest.php
@@ -21,7 +21,7 @@ public function testProvidesSlugify()
         $slugify = $container->get(SlugifyInterface::class);
 
         $this->assertInstanceOf(SlugifyInterface::class, $slugify);
-        $this->assertAttributeInstanceOf(DefaultRuleProvider::class, 'provider', $slugify);
+        $this->assertInstanceOf(DefaultRuleProvider::class, $this->getProperty($slugify, 'provider'));
     }
 
     public function testProvidesSlugifyAsSharedService()
@@ -65,7 +65,7 @@ public function testProvidesSlugifyUsingSharedProvider()
 
         $slugify = $container->get(SlugifyInterface::class);
 
-        $this->assertAttributeSame($ruleProvider, 'provider', $slugify);
+        $this->assertSame($ruleProvider, $this->getProperty($slugify, 'provider'));
     }
 
     /**
@@ -83,4 +83,13 @@ private function getRuleProviderMock()
 
         return $ruleProvider;
     }
+
+    private function getProperty(SlugifyInterface $slugify, string $name)
+    {
+        $reflection = new \ReflectionClass($slugify);
+        $prop = $reflection->getProperty($name);
+        $prop->setAccessible(true);
+
+        return $prop->getValue($slugify);
+    }
 }
diff --git a/tests/Bridge/Nette/SlugifyExtensionTest.php b/tests/Bridge/Nette/SlugifyExtensionTest.php
@@ -18,7 +18,7 @@
  */
 class SlugifyExtensionTest extends MockeryTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->extension = new SlugifyExtension();
     }

diff --git a/tests/Bridge/Symfony/CocurSlugifyExtensionTest.php b/tests/Bridge/Symfony/CocurSlugifyExtensionTest.php
@@ -12,8 +12,10 @@
 namespace Cocur\Slugify\Tests\Bridge\Symfony;
 
 use Cocur\Slugify\Bridge\Symfony\CocurSlugifyExtension;
-use Mockery as m;
-use Mockery\Adapter\Phpunit\MockeryTestCase;
+use Cocur\Slugify\SlugifyInterface;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 
 /**
  * CocurSlugifyExtensionTest
@@ -26,9 +28,9 @@
  * @license    http://www.opensource.org/licenses/MIT The MIT License
  * @group      unit
  */
-class CocurSlugifyExtensionTest extends MockeryTestCase
+class CocurSlugifyExtensionTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->extension = new CocurSlugifyExtension();
     }
@@ -38,36 +40,37 @@ protected function setUp()
      */
     public function testLoad()
     {
-        $twigDefinition = m::mock('Symfony\Component\DependencyInjection\Definition');
+        $twigDefinition = $this->createMock(Definition::class);
         $twigDefinition
-            ->shouldReceive('addTag')
-            ->with('twig.extension')
-            ->once()
-            ->andReturn($twigDefinition);
+            ->expects($this->once())
+            ->method('addTag')
+            ->with($this->equalTo('twig.extension'))
+            ->willReturn($twigDefinition);
         $twigDefinition
-            ->shouldReceive('setPublic')
-            ->with(false)
-            ->once();
+            ->expects($this->once())
+            ->method('setPublic')
+            ->with($this->equalTo(false))
+            ->willReturn($twigDefinition);
 
-        $container = m::mock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $container = $this->createMock(ContainerBuilder::class);
         $container
-            ->shouldReceive('setDefinition')
-            ->with('cocur_slugify', m::type('Symfony\Component\DependencyInjection\Definition'))
-            ->once();
+            ->expects($this->exactly(2))
+            ->method('setDefinition')
+            ->withConsecutive(
+                [$this->equalTo('cocur_slugify'), $this->isInstanceOf(Definition::class)],
+                [$this->equalTo('cocur_slugify.twig.slugify', $this->isInstanceOf(Definition::class))]
+            )
+            ->willReturnOnConsecutiveCalls(
+                $this->createMock(Definition::class),
+                $twigDefinition
+            );
         $container
-            ->shouldReceive('setDefinition')
-            ->with('cocur_slugify.twig.slugify', m::type('Symfony\Component\DependencyInjection\Definition'))
-            ->once()
-            ->andReturn($twigDefinition);
-        $container
-            ->shouldReceive('setAlias')
-            ->with('slugify', 'cocur_slugify')
-            ->once();
-        $container
-            ->shouldReceive('setAlias')
-            ->with('Cocur\Slugify\SlugifyInterface', 'cocur_slugify')
-            ->once();
-
+            ->expects($this->exactly(2))
+            ->method('setAlias')
+            ->withConsecutive(
+                [$this->equalTo('slugify'), $this->equalTo('cocur_slugify')],
+                [$this->equalTo(SlugifyInterface::class), $this->equalTo('cocur_slugify')]
+            );
         $this->extension->load([], $container);
     }
 }