Symfony 5 and PhPUnit 9 update (#1)

Update Symfony components to v5 and PHPUnit to v9
naucon · May 29, 2024 · bf4fe76 · bf4fe76
1 parent 270ab28
commit bf4fe76
Show file tree

Hide file tree

Showing 16 changed files with 77 additions and 108 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,24 +3,6 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build-test-71:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: php-actions/composer@v6
-        with:
-          version: 1
-          php_version: "7.1"
-
-      - name: PHPUnit Tests
-        uses: php-actions/phpunit@v3
-        with:
-          version: 7
-          php_version: "7.1"
-          configuration: phpunit.xml.dist
-          bootstrap: vendor/autoload.php
   build-test-74:
     runs-on: ubuntu-latest
 
@@ -35,7 +17,7 @@ jobs:
       - name: PHPUnit Tests
         uses: php-actions/phpunit@v3
         with:
-          version: 7
+          version: 9
           php_version: "7.4"
           configuration: phpunit.xml.dist
           bootstrap: vendor/autoload.php
diff --git a/composer.json b/composer.json
@@ -11,18 +11,16 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": ">=7.3",
         "naucon/utility": "~1.0",
         "naucon/registry": "~1.0",
         "doctrine/common": "^3.0.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^9.0",
         "predis/predis": "^1.1",
-        "doctrine/orm": "~2.0",
-        "symfony/yaml": "^4.4",
-        "symfony/cache": "^4.4",
-        "symfony/http-foundation": "~2.8",
+        "doctrine/orm": "^2.0",
+        "symfony/http-foundation": "^4.0 || ^5.0",
         "psr/cache": "~1.0",
         "psr/simple-cache": "~1.0"
     },

diff --git a/tests/Identity/IdentityValidatorTest.php b/tests/Identity/IdentityValidatorTest.php
@@ -9,6 +9,7 @@
  */
 namespace Naucon\Storage\Tests\Identity;
 
+use Naucon\Storage\Exception\InvalidArgumentException;
 use Naucon\Storage\Identity\IdentityValidator;
 use Naucon\Storage\Identity\IdentityValidatorInterface;
 use PHPUnit\Framework\TestCase;
@@ -54,33 +55,27 @@ public function identifierProvider()
         ];
     }
 
-    /**
-     * @expectedException \Naucon\Storage\Exception\InvalidArgumentException
-     */
     public function testValidateWithEmptyStringShouldThrowException()
     {
+        $this->expectException(InvalidArgumentException::class);
         $identifier = '';
 
         $validator = new IdentityValidator();
         $validator->validate($identifier);
     }
 
-    /**
-     * @expectedException \Naucon\Storage\Exception\InvalidArgumentException
-     */
     public function testValidateWithNullShouldThrowException()
     {
+        $this->expectException(InvalidArgumentException::class);
         $identifier = null;
 
         $validator = new IdentityValidator();
         $validator->validate($identifier);
     }
 
-    /**
-     * @expectedException \Naucon\Storage\Exception\InvalidArgumentException
-     */
     public function testValidateWithIllegalCharactersShouldThrowException()
     {
+        $this->expectException(InvalidArgumentException::class);
         $identifier = 'foo@';
 
         $validator = new IdentityValidator();

diff --git a/tests/Provider/ArrayStorageTest.php b/tests/Provider/ArrayStorageTest.php
@@ -16,18 +16,18 @@
 class ArrayStorageTest extends TestCase
 {
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model1;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model2;
 
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Provider/DoctrineStorageTest.php b/tests/Provider/DoctrineStorageTest.php
@@ -13,8 +13,8 @@
 use Doctrine\Persistence\ObjectRepository;
 use Naucon\Storage\Tests\Model\Product;
 use Naucon\Storage\Provider\DoctrineStorage;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 
 class DoctrineStorageTest extends TestCase
 {
@@ -29,13 +29,13 @@ class DoctrineStorageTest extends TestCase
     protected $model2;
 
     /**
-     * @var ObjectManager|PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManager|MockObject
      */
     protected $objectManagerMock;
 
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Provider/FileStorageTest.php b/tests/Provider/FileStorageTest.php
@@ -16,12 +16,12 @@
 class FileStorageTest extends TestCase
 {
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model1;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model2;
 
@@ -32,7 +32,7 @@ class FileStorageTest extends TestCase
 
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -50,7 +50,7 @@ public function setUp()
         @mkdir($this->storageDir);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         array_map('unlink', glob($this->storageDir . '/storage-model-*'));
         if (is_dir($this->storageDir)) {

diff --git a/tests/Provider/NativeSessionStorageTest.php b/tests/Provider/NativeSessionStorageTest.php
@@ -19,18 +19,18 @@
 class NativeSessionStorageTest extends TestCase
 {
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model1;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model2;
 
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -47,7 +47,7 @@ public function setUp()
         $this->model2->setDescription('Pear');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($_SESSION);
 

diff --git a/tests/Provider/NullStorageTest.php b/tests/Provider/NullStorageTest.php
@@ -16,18 +16,18 @@
 class NullStorageTest extends TestCase
 {
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model1;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model2;
 
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Provider/PsrCacheStorageTest.php b/tests/Provider/PsrCacheStorageTest.php
@@ -9,6 +9,8 @@
  */
 namespace Naucon\Storage\Tests\Provider;
 
+use Naucon\Storage\Exception\UnsupportedException;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
@@ -24,28 +26,28 @@
 class PsrCacheStorageTest extends TestCase
 {
     /**
-     * @var CacheItemPoolInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheItemPoolInterface|MockObject
      */
     protected $cache;
 
     /**
-     * @var CacheItemInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheItemInterface|MockObject
      */
     protected $cacheItem;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model1;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model2;
 
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -351,11 +353,9 @@ public function testHas()
         $this->assertFalse($storage->has($badIdentifier));
     }
 
-    /**
-     * @expectedException  \Naucon\Storage\Exception\UnsupportedException
-     */
     public function testFindAll()
     {
+        $this->expectException(UnsupportedException::class);
         $cache  = $this->cache;
 
         $storage = new PsrCacheStorage($cache, Product::class);

diff --git a/tests/Provider/PsrSimpleCacheStorageTest.php b/tests/Provider/PsrSimpleCacheStorageTest.php
@@ -9,8 +9,10 @@
  */
 namespace Naucon\Storage\Tests\Provider;
 
+use Naucon\Storage\Exception\UnsupportedException;
 use Naucon\Storage\Provider\PsrSimpleCacheStorage;
 use Naucon\Storage\Tests\Model\Product;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\SimpleCache\CacheInterface;
 
@@ -23,23 +25,23 @@
 class PsrSimpleCacheStorageTest extends TestCase
 {
     /**
-     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheInterface|MockObject
      */
     protected $cache;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model1;
 
     /**
-     * @var \Naucon\Storage\Tests\Model\Product
+     * @var Product
      */
     protected $model2;
 
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -269,11 +271,9 @@ public function testHas()
         $this->assertFalse($storage->has($badIdentifier));
     }
 
-    /**
-     * @expectedException  \Naucon\Storage\Exception\UnsupportedException
-     */
     public function testFindAll()
     {
+        $this->expectException(UnsupportedException::class);
         $cache  = $this->cache;
 
         $storage = new PsrSimpleCacheStorage($cache, Product::class);

diff --git a/tests/Provider/RedisStorageTest.php b/tests/Provider/RedisStorageTest.php
@@ -12,8 +12,8 @@
 use Naucon\Storage\Exception\StorageException;
 use Naucon\Storage\Provider\RedisStorage;
 use Naucon\Storage\Tests\Model\Product;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 use Predis\Client;
 use Predis\ClientException;
 use Predis\Profile\ProfileInterface;
@@ -27,7 +27,7 @@
 class RedisStorageTest extends TestCase
 {
     /**
-     * @var Client|PHPUnit_Framework_MockObject_MockObject
+     * @var Client|MockObject
      */
     protected $client;
 
@@ -42,13 +42,13 @@ class RedisStorageTest extends TestCase
     protected $model2;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->client = $this->getMockBuilder(Client::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['get', 'mget', 'set', 'setex', 'del', 'exists', 'keys', 'scan', 'getProfile', 'flushdb'])
+            ->addMethods(['get', 'mget', 'set', 'setex', 'del', 'exists', 'keys', 'scan', 'flushdb'])
+            ->onlyMethods(['getProfile'])
             ->getMock();
 
         $this->model1 = new Product();
@@ -447,9 +447,7 @@ public function testFindAllOnInaccessibleRedis()
         $expectedKey = '52e848a7eeaa022db017f9b25087fc45:2';
         $client = $this->client;
 
-        $profileInterface = $this->getMockBuilder(ProfileInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $profileInterface = $this->getMockBuilder(ProfileInterface::class)->getMock();
 
         $profileInterface->expects($this->any())
             ->method('supportsCommand')