Merge pull request #15 from stof/bump_min_versions

Drop support for unmaintained versions of Symfony 5 and PHP

Author: stof

.github/workflows/ci.yml

@@ -4,9 +4,6 @@ on:
     push:
     pull_request:
 
-env:
-    SYMFONY_PHPUNIT_REMOVE: ''
-
 jobs:
     check_composer:
         name: Check composer.json
@@ -16,7 +13,7 @@ jobs:
             - uses: shivammathur/setup-php@v2
               with:
                   coverage: none
-                  php-version: '7.4'
+                  php-version: '8.0'
             - run: composer validate --strict --no-check-lock
 
     tests:
@@ -26,15 +23,15 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ '7.2', '7.3', '7.4', '8.0' ]
+                php: [ '7.4', '8.0' ]
                 min_stability: [ '' ]
                 name_suffix: [ '' ]
                 composer_flags: [ '' ]
                 include:
                     - php: '8.0'
                       min_stability: 'dev'
                       name_suffix: ' (dev deps)'
-                    - php: '7.2'
+                    - php: '7.4'
                       min_stability: ''
                       name_suffix: ' (lowest deps)'
                       composer_flags: '--prefer-lowest'
@@ -53,8 +50,5 @@ jobs:
             -   name: Install dependencies
                 run: composer update --ansi --no-progress --prefer-dist --no-interaction ${{ matrix.composer_flags }}
 
-            -   name: Install PHPUnit
-                run: vendor/bin/simple-phpunit install
-
             -   name: Run tests
-                run: vendor/bin/simple-phpunit -v --colors=always
+                run: vendor/bin/phpunit -v --colors=always

.gitignore

@@ -2,3 +2,4 @@
 /composer.lock
 /phpunit.xml
 /vendor/
+/.phpunit.result.cache

composer.json

@@ -11,17 +11,19 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "symfony/asset": "^3.4.36 || ^4.3 || ^5.0",
-        "symfony/cache": "^3.4.36 || ^4.3 || ^5.0",
-        "symfony/config": "^3.4.36 || ^4.3 || ^5.0",
-        "symfony/dependency-injection": "^3.4.36 || ^4.3 || ^5.0",
-        "symfony/finder": "^3.4.36 || ^4.3 || ^5.0",
-        "symfony/framework-bundle": "^3.4.36 || ^4.3 || ^5.0",
-        "symfony/http-kernel": "^3.4.36 || ^4.3 || ^5.0"
+        "php": ">=7.4",
+        "symfony/asset": "^3.4.36 || ^4.4.13 || ^5.3",
+        "symfony/cache": "^3.4.36 || ^4.4.13 || ^5.3",
+        "symfony/config": "^3.4.36 || ^4.4 || ^5.3",
+        "symfony/dependency-injection": "^3.4.36 || ^4.4.13 || ^5.3",
+        "symfony/finder": "^3.4.36 || ^4.4.13 || ^5.3",
+        "symfony/framework-bundle": "^3.4.36 || ^4.3.13 || ^5.3",
+        "symfony/http-kernel": "^3.4.36 || ^4.4.13 || ^5.3"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^5.2"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.5",
+        "symfony/phpunit-bridge": "^5.3"
     },
     "autoload": {
         "psr-4": {
@@ -33,6 +35,9 @@
             "Incenteev\\HashedAssetBundle\\Tests\\": "tests"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.x-dev"

phpunit.xml.dist

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory>./src</directory>
+        </include>
+        <exclude>
+            <directory>./src/Resources</directory>
+        </exclude>
+    </coverage>
     <testsuites>
         <testsuite name="HashedAssetBundle test suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./src/Resources</directory>
-            </exclude>
-        </whitelist>
-    </filter>
 </phpunit>

src/CacheWarmer/HashCacheWarmer.php

@@ -31,7 +31,7 @@ public function __construct(AssetFinder $assetFinder, string $cacheFile, AssetHa
         $this->fallbackPool = $fallbackPool;
     }
 
-    public function warmUp($cacheDir)
+    public function warmUp($cacheDir): array
     {
         $phpArrayPool = new PhpArrayAdapter($this->cacheFile, $this->fallbackPool);
         $arrayPool = new ArrayAdapter(0, false);
@@ -50,6 +50,8 @@ public function warmUp($cacheDir)
             $this->fallbackPool->saveDeferred($item->set($v));
         }
         $this->fallbackPool->commit();
+
+        return [];
     }
 
     public function isOptional(): bool

tests/Asset/HashingVersionStrategyTest.php

@@ -5,9 +5,12 @@
 use Incenteev\HashedAssetBundle\Asset\HashingVersionStrategy;
 use Incenteev\HashedAssetBundle\Hashing\AssetHasherInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class HashingVersionStrategyTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testGetVersion()
     {
         $hasher = $this->prophesize(AssetHasherInterface::class);

tests/CacheWarmer/HashCacheWarmerTest.php

@@ -6,12 +6,15 @@
 use Incenteev\HashedAssetBundle\CacheWarmer\HashCacheWarmer;
 use Incenteev\HashedAssetBundle\Hashing\AssetHasherInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 
 class HashCacheWarmerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testWarmUp()
     {
         $hasher = $this->prophesize(AssetHasherInterface::class);
@@ -49,7 +52,7 @@ public function testWarmUp()
             $this->assertIsArray($values);
         } else {
             $this->assertInternalType('array', $values);
-        }   
+        }
         $this->assertCount(2, $values);
         $this->assertArrayHasKey(base64_encode('foo'), $values);
         $this->assertArrayHasKey(base64_encode('bar/baz.js'), $values);

tests/Hashing/CachedHasherTest.php

@@ -5,10 +5,13 @@
 use Incenteev\HashedAssetBundle\Hashing\AssetHasherInterface;
 use Incenteev\HashedAssetBundle\Hashing\CachedHasher;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
 class CachedHasherTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testComputeHash()
     {
         $delegateHasher = $this->prophesize(AssetHasherInterface::class);