Upgrade PHPUnit to v9.4, adjust tests

Author: smoskalenko

composer.json

@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.4",
         "mikey179/vfsstream": "^1.6"
     }
 }

phpunit.xml

@@ -1,29 +1,24 @@
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
-         cacheTokens="true"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          forceCoversAnnotation="false"
-         mapTestClassNameToCoveredClassName="false"
-         printerClass="PHPUnit_TextUI_ResultPrinter"
          processIsolation="false"
          stopOnError="true"
          stopOnFailure="true"
          stopOnIncomplete="false"
          stopOnSkipped="false"
-         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
-         strict="false"
          verbose="false">
 
     <php>
         <env name="APPLICATION_ENV" value="testing"/>
     </php>
 
     <testsuites>
-        <testsuite>
+        <testsuite name="Tests">
             <directory>test</directory>
         </testsuite>
     </testsuites>

test/integration/ApplicationTest.php

@@ -2,9 +2,10 @@
 
 namespace Barberry;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation;
 
-class ApplicationTest extends \PHPUnit_Framework_TestCase
+class ApplicationTest extends TestCase
 {
     public function testCanRun(): void
     {

test/integration/CacheTest.php

@@ -1,23 +1,28 @@
 <?php
+
 namespace Barberry;
 
-use Barberry\nonlinear;
 use Barberry\Test;
+use PHPUnit\Framework\TestCase;
 
-class CacheIntegrationTest extends \PHPUnit_Framework_TestCase {
+class CacheIntegrationTest extends TestCase
+{
 
     private $cache_path;
 
-    protected function setUp() {
+    protected function setUp(): void
+    {
         $this->cache_path = '/tmp/testCache/';
         @mkdir($this->cache_path);
     }
 
-    protected function tearDown() {
+    protected function tearDown(): void
+    {
         exec('rm -rf ' . $this->cache_path);
     }
 
-    public function testIsContentSavedInFileSystem() {
+    public function testIsContentSavedInFileSystem()
+    {
         $this->cache()->save(
             Test\Data::gif1x1(),
             new Request('/7yU98sd_1x1.gif')
@@ -28,7 +33,8 @@ public function testIsContentSavedInFileSystem() {
         $this->assertEquals(file_get_contents($expectedPath), Test\Data::gif1x1());
     }
 
-    public function testIsContentSavedInFileSystemInGroupDirectory() {
+    public function testIsContentSavedInFileSystemInGroupDirectory()
+    {
         $this->cache()->save(
             Test\Data::gif1x1(),
             new Request('/adm/7yU98sd_1x1.gif')
@@ -51,7 +57,8 @@ public function testInvalidateRemovesCachedContent()
         $this->assertFalse(is_dir($this->cache_path . '/7y/U9/8s/7yU98sd'));
     }
 
-    private function cache() {
+    private function cache()
+    {
         return new Cache($this->cache_path);
     }
 }

test/integration/Storage/FileTest.php

@@ -6,20 +6,21 @@
 use Barberry\fs;
 use GuzzleHttp\Psr7\UploadedFile;
 use GuzzleHttp\Psr7\Utils;
+use PHPUnit\Framework\TestCase;
 
-class FileTest extends \PHPUnit_Framework_TestCase
+class FileTest extends TestCase
 {
     private $storage_path;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->storage_path = '/tmp/testStorage/';
         if (!is_dir($this->storage_path)) {
             mkdir($this->storage_path);
         }
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         fs\rmDirRecursive($this->storage_path);
     }
@@ -77,13 +78,13 @@ public function testIsFileDeletedById()
 
     public function testNotFoundException()
     {
-        $this->setExpectedException('Barberry\\Storage\\NotFoundException');
+        $this->expectException(NotFoundException::class);
         $this->storage()->getById('not-existing-id');
     }
 
     public function testGetByIdTestsForFileExistance()
     {
-        $this->setExpectedException('Barberry\\Storage\\NotFoundException');
+        $this->expectException(NotFoundException::class);
         $this->storage()->getById('/');
     }
 

test/unit/CacheTest.php

@@ -5,8 +5,9 @@
 use GuzzleHttp\Psr7\Utils;
 use Mockery as m;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
 
-class CacheTest extends \PHPUnit_Framework_TestCase
+class CacheTest extends TestCase
 {
     use m\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
@@ -28,18 +29,10 @@ public function setUp(): void
      */
     public function testConvertsUriToFilePath(string $uri, string $expectedPath): void
     {
-        $cache = $this->getMockBuilder(Cache::class)
-            ->setMethods(['writeToFilesystem'])
-            ->enableOriginalConstructor()
-            ->setConstructorArgs([self::$filesystem->url() . '/cache'])
-            ->getMock();
-
-        $cache
-            ->expects($this->any())
-            ->method('writeToFilesystem')
-            ->with('123', $expectedPath);
-
+        $cache = new Cache(self::$filesystem->url() . '/cache');
         $cache->save('123', new Request($uri));
+
+        self::assertFileExists(self::$filesystem->url() . '/cache' . $expectedPath);
     }
 
     public function testStreamDataCanBeSaved(): void

test/unit/ConfigTest.php

@@ -1,9 +1,13 @@
 <?php
+
 namespace Barberry;
 
-class ConfigTest extends \PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
 
-    public function testOptionsCanBeOverriden() {
+class ConfigTest extends TestCase
+{
+    public function testOptionsCanBeOverriden()
+    {
         $config = new Config(__DIR__, '/test_config.php');
         $this->assertEquals('/usr/another/storage', $config->directoryStorage);
     }

test/unit/ControllerTest.php

@@ -13,9 +13,10 @@
 use GuzzleHttp\Psr7\Utils;
 use Mockery as m;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation;
 
-class ControllerTest extends \PHPUnit_Framework_TestCase
+class ControllerTest extends TestCase
 {
     use m\Adapter\Phpunit\MockeryPHPUnitIntegration;
 

test/unit/Direction/FactoryTest.php

@@ -1,9 +1,13 @@
 <?php
+
 namespace Barberry\Direction;
+
 use Barberry\ContentType;
-use Barberry\Plugin;
+use Barberry\Plugin\NotAvailableException;
+use PHPUnit\Framework\TestCase;
 
-class FactoryTest extends \PHPUnit_Framework_TestCase {
+class FactoryTest extends TestCase
+{
 
     public function testDetectsDirectionClassName() {
         $this->assertInstanceOf(
@@ -13,7 +17,7 @@ public function testDetectsDirectionClassName() {
     }
 
     public function testThrowExceptionWhenDirectionIsNotAvailable() {
-        $this->setExpectedException('Barberry\Plugin\NotAvailableException', 'text/x-php to image/jpeg');
+        $this->expectException(NotAvailableException::class);
         self::factory()->direction(ContentType::byExtention('php'), ContentType::byExtention('jpeg'));
     }
 
@@ -25,7 +29,7 @@ public function testSameSourceAndDestinationWithoutCommandActivatesNullPlugin()
     }
 
     public function testSameSourceAndDestinationWithCommandRequiresPlugin() {
-        $this->setExpectedException('Barberry\Plugin\NotAvailableException');
+        $this->expectException(NotAvailableException::class);
         self::factory()->direction(ContentType::byExtention('php'), ContentType::byExtention('php'), '12');
     }
 

test/unit/Filter/FilterCompositeTest.php

@@ -5,8 +5,9 @@
 use Barberry\PostedFile\Collection;
 use GuzzleHttp\Psr7\UploadedFile;
 use GuzzleHttp\Psr7\Utils;
+use PHPUnit\Framework\TestCase;
 
-class FilterCompositeTest extends \PHPUnit_Framework_TestCase
+class FilterCompositeTest extends TestCase
 {
 
     public function testImplementsFilterInterface()