Beautify tests

Author: Warxcell

tests/MigratorTest.php

@@ -8,10 +8,12 @@
 use Arxy\FilesBundle\NamingStrategy;
 use Arxy\FilesBundle\Storage\FlysystemStorage;
 use League\Flysystem\FilesystemOperator;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class MigratorTest extends TestCase
 {
+    /** @var FilesystemOperator & MockObject */
     private FilesystemOperator $filesystem;
     private NamingStrategy $oldNamingStrategy;
     private NamingStrategy $newNamingStrategy;

tests/PathResolverManagerTest.php

@@ -12,6 +12,8 @@
 use SplFileObject;
 use SplTempFileObject;
 
+use function fopen;
+
 class PathResolverManagerTest extends TestCase
 {
     /** @var ManagerInterface & MockObject */
@@ -59,10 +61,12 @@ public function testRead(): void
     public function testReadStream(): void
     {
         $file = new File('filename', 125, '098f6bcd4621d373cade4e832627b4f6', 'image/jpeg');
-        $this->decorated->expects(self::once())->method('readStream')->with($file)->willReturn('!!!');
+
+        $stream = fopen('php://memory', 'r');
+        $this->decorated->expects(self::once())->method('readStream')->with($file)->willReturn($stream);
 
         $actual = $this->decorator->readStream($file);
-        self::assertSame('!!!', $actual);
+        self::assertSame($stream, $actual);
     }
 
     public function testMove(): void

tests/Preview/DimensionTest.php

@@ -11,67 +11,74 @@
 
 class DimensionTest extends TestCase
 {
-    public function constructorDataProvider()
+    public function constructorDataProvider(): iterable
     {
-        return [
-            [1, 1],
-            [5, 5],
-            [
-                0,
-                1,
-                InvalidArgumentException::class,
-                'Length of either side cannot be 0 or negative, current size is 0x1',
-            ],
-            [
-                1,
-                0,
-                InvalidArgumentException::class,
-                'Length of either side cannot be 0 or negative, current size is 1x0',
-            ],
-            [
-                0,
-                0,
-                InvalidArgumentException::class,
-                'Length of either side cannot be 0 or negative, current size is 0x0',
-            ],
-            [
-                -1,
-                1,
-                InvalidArgumentException::class,
-                'Length of either side cannot be 0 or negative, current size is -1x1',
-            ],
-            [
-                1,
-                -1,
-                InvalidArgumentException::class,
-                'Length of either side cannot be 0 or negative, current size is 1x-1',
-            ],
-            [
-                -1,
-                -1,
-                InvalidArgumentException::class,
-                'Length of either side cannot be 0 or negative, current size is -1x-1',
-            ],
-            [null, 1, TypeError::class],
-            [1, null, TypeError::class],
-        ];
+        yield [1, 1];
+        yield [5, 5];
     }
 
     /**
      * @dataProvider constructorDataProvider
      */
-    public function testConstructor(
+    public function testConstructor(int $width, int $height): void
+    {
+        $this->expectNotToPerformAssertions();
+        new Dimension($width, $height);
+    }
+
+    public function constructorExceptionsDataProvider(): iterable
+    {
+        yield [
+            0,
+            1,
+            InvalidArgumentException::class,
+            'Length of either side cannot be 0 or negative, current size is 0x1',
+        ];
+        yield [
+            1,
+            0,
+            InvalidArgumentException::class,
+            'Length of either side cannot be 0 or negative, current size is 1x0',
+        ];
+        yield [
+            0,
+            0,
+            InvalidArgumentException::class,
+            'Length of either side cannot be 0 or negative, current size is 0x0',
+        ];
+        yield [
+            -1,
+            1,
+            InvalidArgumentException::class,
+            'Length of either side cannot be 0 or negative, current size is -1x1',
+        ];
+        yield [
+            1,
+            -1,
+            InvalidArgumentException::class,
+            'Length of either side cannot be 0 or negative, current size is 1x-1',
+        ];
+        yield [
+            -1,
+            -1,
+            InvalidArgumentException::class,
+            'Length of either side cannot be 0 or negative, current size is -1x-1',
+        ];
+        yield [null, 1, TypeError::class];
+        yield [1, null, TypeError::class];
+    }
+
+    /**
+     * @dataProvider constructorExceptionsDataProvider
+     */
+    public function testConstructorExceptions(
         ?int $width,
         ?int $height,
-        ?string $expectException = null,
+        string $expectException,
         ?string $expectExceptionMessage = null
     ): void {
-        if ($expectException !== null) {
-            $this->expectException($expectException);
-            $this->expectExceptionMessage($expectExceptionMessage);
-        } else {
-            $this->expectNotToPerformAssertions();
-        }
+        $this->expectException($expectException);
+        $this->expectExceptionMessage($expectExceptionMessage);
 
         new Dimension($width, $height);
     }

tests/Repository/ORMTest.php

@@ -7,6 +7,7 @@
 use Arxy\FilesBundle\Repository\ORM;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ORMTest extends TestCase