Refactor tests for DownloadUtility.

Add typehints.
Warxcell · May 29, 2021 · 7c05a12 · 7c05a12
1 parent 1cd8490
commit 7c05a12
Show file tree

Hide file tree

Showing 31 changed files with 208 additions and 193 deletions.
diff --git a/src/EventListener/DoctrineORMListener.php b/src/EventListener/DoctrineORMListener.php
@@ -76,6 +76,11 @@ public function postPersist(LifecycleEventArgs $eventArgs): void
     }
 
     public function preRemove(LifecycleEventArgs $eventArgs): void
+    {
+        $this->postRemove($eventArgs);
+    }
+
+    public function postRemove(LifecycleEventArgs $eventArgs): void
     {
         $entity = $eventArgs->getEntity();
         $entityManager = $eventArgs->getEntityManager();
@@ -86,11 +91,6 @@ public function preRemove(LifecycleEventArgs $eventArgs): void
         $this->handleEmbeddable($entityManager, $entity, $this->remove);
     }
 
-    public function postRemove(LifecycleEventArgs $eventArgs): void
-    {
-        $this->preRemove($eventArgs);
-    }
-
     public function onClear(): void
     {
         $this->manager->clear();

diff --git a/src/Utility/DownloadUtility.php b/src/Utility/DownloadUtility.php
@@ -6,7 +6,6 @@
 
 use Arxy\FilesBundle\ManagerInterface;
 use Arxy\FilesBundle\Model\File;
-use Arxy\FilesBundle\Model\MutableFile;
 use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -24,26 +23,9 @@ public function __construct(ManagerInterface $manager)
         $this->manager = $manager;
     }
 
-    private function createDisposition(File $file): string
-    {
-        if ($file instanceof DownloadableFile) {
-            return HeaderUtils::makeDisposition(
-                $file->isForceDownload() ? HeaderUtils::DISPOSITION_ATTACHMENT : HeaderUtils::DISPOSITION_INLINE,
-                $file->getName() ?? u($file->getOriginalFilename())->ascii()->toString()
-            );
-        } else {
-            return HeaderUtils::makeDisposition(
-                HeaderUtils::DISPOSITION_ATTACHMENT,
-                u($file->getOriginalFilename())->ascii()->toString()
-            );
-        }
-    }
-
     public function createResponse(File $file): StreamedResponse
     {
         $response = new StreamedResponse();
-        $disposition = $this->createDisposition($file);
-        $response->headers->set('Content-Disposition', $disposition);
         $response->headers->set('Content-Type', $file->getMimeType());
         $response->setPublic();
         $response->setEtag($file->getHash());
@@ -52,12 +34,26 @@ public function createResponse(File $file): StreamedResponse
             $expireAt = $file->getExpireAt();
             $response->setExpires($expireAt);
             $response->setLastModified($file->getModifiedAt());
+
+            $contentDisposition = HeaderUtils::makeDisposition(
+                $file->isForceDownload() ? HeaderUtils::DISPOSITION_ATTACHMENT : HeaderUtils::DISPOSITION_INLINE,
+                $file->getName() ?? u($file->getOriginalFilename())->ascii()->toString()
+            );
         } else {
             $expireAt = new DateTimeImmutable("+30 days");
             $response->setExpires($expireAt);
             $response->setLastModified($file->getCreatedAt());
+
+            $contentDisposition = HeaderUtils::makeDisposition(
+                HeaderUtils::DISPOSITION_ATTACHMENT,
+                u($file->getOriginalFilename())->ascii()->toString()
+            );
         }
 
+        $response->headers->set('Content-Length', $file->getSize());
+
+        $response->headers->set('Content-Disposition', $contentDisposition);
+
         $stream = $this->manager->readStream($file);
         $response->setCallback(
             static function () use ($stream): void {

diff --git a/src/Utility/DownloadableFile.php b/src/Utility/DownloadableFile.php
@@ -4,9 +4,9 @@
 
 namespace Arxy\FilesBundle\Utility;
 
-use Arxy\FilesBundle\Entity\MutableFile;
 use Arxy\FilesBundle\Model\DecoratedFile;
 use Arxy\FilesBundle\Model\File;
+use Arxy\FilesBundle\Model\MutableFile;
 use DateTimeImmutable;
 use DateTimeInterface;
 

diff --git a/tests/AbstractModelFactoryTest.php b/tests/AbstractModelFactoryTest.php
@@ -10,7 +10,7 @@
 
 class AbstractModelFactoryTest extends TestCase
 {
-    public function testCreate()
+    public function testCreate(): void
     {
         $factory = new AbstractModelFactory(File::class);
         $file = $factory->create(new \SplFileInfo(__DIR__.'/files/image1.jpg'), 'name', 12345, 'hash', 'mimeType');
@@ -21,7 +21,7 @@ public function testCreate()
         self::assertSame('mimeType', $file->getMimeType());
     }
 
-    public function testInvalidClass()
+    public function testInvalidClass(): void
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage(

diff --git a/tests/Command/MigrateNamingStrategyCommandTest.php b/tests/Command/MigrateNamingStrategyCommandTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
         $this->command = new MigrateNamingStrategyCommand($this->migrator, $this->repository);
     }
 
-    public function testExecute()
+    public function testExecute(): void
     {
         $file1 = new File('filename', 125, '098f6bcd4621d373cade4e832627b4f6', 'image/jpeg');
         $file1->setId(1);

diff --git a/tests/DelegatingManagerTest.php b/tests/DelegatingManagerTest.php
@@ -35,15 +35,15 @@ protected function setUp(): void
         );
     }
 
-    public function testZeroManagers()
+    public function testZeroManagers(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('You should pass at least one manager!');
 
         new DelegatingManager([]);
     }
 
-    public function testRead()
+    public function testRead(): void
     {
         $file1 = new File('original_filename.jpg', 125, '098f6bcd4621d373cade4e832627b4f6', 'image/jpeg');
         $file2 = new File2('original_filename.jpg', 125, '098f6bcd4621d373cade4e832627b4f6', 'image/jpeg');
@@ -55,7 +55,7 @@ public function testRead()
         self::assertSame('manager2Read', $this->manager->read($file2));
     }
 
-    public function testReadStream()
+    public function testReadStream(): void
     {
         $file1 = new File('original_filename.jpg', 125, '098f6bcd4621d373cade4e832627b4f6', 'image/jpeg');
         $file2 = new File2('original_filename.jpg', 125, '098f6bcd4621d373cade4e832627b4f6', 'image/jpeg');
@@ -67,7 +67,7 @@ public function testReadStream()
         self::assertSame('manager2Read', $this->manager->readStream($file2));
     }
 
-    public function testGetPathname()
+    public function testGetPathname(): void
     {
         $file1 = new File('original_filename.jpg', 125, '1234567', 'image/jpeg');
         $file1->setId(1);
@@ -92,7 +92,7 @@ public function testGetPathname()
         );
     }
 
-    public function testWrite()
+    public function testWrite(): void
     {
         $file1 = new File('original_filename.jpg', 125, '1234567', 'image/jpeg');
 
@@ -101,7 +101,7 @@ public function testWrite()
         $this->manager->write($file1, 'test');
     }
 
-    public function testWriteStream()
+    public function testWriteStream(): void
     {
         $file1 = new File('original_filename.jpg', 125, '1234567', 'image/jpeg');
         $stream = fopen('data://text/plain,test', 'r');
@@ -111,61 +111,61 @@ public function testWriteStream()
         $this->manager->writeStream($file1, $stream);
     }
 
-    public function testNoManagerForFileRead()
+    public function testNoManagerForFileRead(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No manager for Arxy\FilesBundle\Tests\File3');
         $this->manager->read(new File3('original_filename.jpg', 125, '1234567', 'image/jpeg'));
     }
 
-    public function testNoManagerForFileReadStream()
+    public function testNoManagerForFileReadStream(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No manager for Arxy\FilesBundle\Tests\File3');
         $this->manager->readStream(new File3('original_filename.jpg', 125, '1234567', 'image/jpeg'));
     }
 
-    public function testNoManagerForFileWrite()
+    public function testNoManagerForFileWrite(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No manager for Arxy\FilesBundle\Tests\File3');
         $this->manager->readStream(new File3('original_filename.jpg', 125, '1234567', 'image/jpeg'));
     }
 
-    public function testNoManagerForFileWriteStream()
+    public function testNoManagerForFileWriteStream(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No manager for Arxy\FilesBundle\Tests\File3');
         $this->manager->readStream(new File3('original_filename.jpg', 125, '1234567', 'image/jpeg'));
     }
 
-    public function testNoManagerForFilePathname()
+    public function testNoManagerForFilePathname(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No manager for Arxy\FilesBundle\Tests\File3');
         $this->manager->getPathname(new File3('original_filename.jpg', 125, '1234567', 'image/jpeg'));
     }
 
-    public function testNoManagerForFileMove()
+    public function testNoManagerForFileMove(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No manager for Arxy\FilesBundle\Tests\File3');
         $this->manager->moveFile(new File3('original_filename.jpg', 125, '1234567', 'image/jpeg'));
     }
 
-    public function testNoManagerForRemove()
+    public function testNoManagerForRemove(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('No manager for Arxy\FilesBundle\Tests\File3');
         $this->manager->remove(new File3('original_filename.jpg', 125, '1234567', 'image/jpeg'));
     }
 
-    public function testGetClass()
+    public function testGetClass(): void
     {
         self::assertEquals($this->manager1->getClass(), $this->manager->getClass());
     }
 
-    public function testMainManager()
+    public function testMainManager(): void
     {
         $forUpload = new \SplFileInfo(__DIR__.'/files/image1.jpg');
         $uploadedFile = new File2('original_filename.jpg', 125, '1234567', 'image/jpeg');
@@ -186,7 +186,7 @@ public function testMainManager()
         self::assertSame($uploadedFile, $actualFile);
     }
 
-    public function testClear()
+    public function testClear(): void
     {
         $manager1 = $this->createMock(ManagerInterface::class);
         $manager1->expects($this->once())->method('clear');

diff --git a/tests/Form/Type/FileTypeTest.php b/tests/Form/Type/FileTypeTest.php
@@ -24,24 +24,23 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    protected function getExtensions()
+    protected function getExtensions(): array
     {
         $type = new FileType($this->manager);
 
         return [
             new PreloadedExtension([$type], []),
-
         ];
     }
 
-    protected function getTypeExtensions()
+    protected function getTypeExtensions(): array
     {
         return [
             new FormTypeHttpFoundationExtension(),
         ];
     }
 
-    public function testSingleUpload()
+    public function testSingleUpload(): void
     {
         $uploadedFile = new UploadedFile(__DIR__.'/../../files/image1.jpg', 'image1.jpg');
 
@@ -61,7 +60,7 @@ public function testSingleUpload()
         self::assertSame($file, $actual);
     }
 
-    public function testMultipleUpload()
+    public function testMultipleUpload(): void
     {
         $uploadedFile1 = new UploadedFile(__DIR__.'/../../files/image1.jpg', 'image1.jpg');
         $uploadedFile2 = new UploadedFile(__DIR__.'/../../files/image2.jpg', 'image2.jpg');

diff --git a/tests/Functional/LiipImagine/FileFilterPathResolverTest.php b/tests/Functional/LiipImagine/FileFilterPathResolverTest.php
@@ -34,7 +34,7 @@ public function setUp(): void
         $this->entityManager->flush();
     }
 
-    public function testFilter()
+    public function testFilter(): void
     {
         $pathResolver = self::$container->get(FileFilterPathResolver::class);
         assert($pathResolver instanceof FileFilterPathResolver);
@@ -46,7 +46,7 @@ public function testFilter()
         );
     }
 
-    public function testInvalidInstancePassed()
+    public function testInvalidInstancePassed(): void
     {
         $pathResolver = self::$container->get(FileFilterPathResolver::class);
         assert($pathResolver instanceof FileFilterPathResolver);

diff --git a/tests/Functional/Preview/PreviewGeneratorMessengerTest.php b/tests/Functional/Preview/PreviewGeneratorMessengerTest.php
@@ -20,7 +20,7 @@ protected static function getBundles(): array
         return [];
     }
 
-    public function testImagePreview()
+    public function testImagePreview(): void
     {
         $file = $this->manager->upload(new SplFileInfo(__DIR__.'/../../files/image1.jpg'));
         assert($file instanceof FileWithPreview);
@@ -45,7 +45,7 @@ public function testImagePreview()
 //        self::assertSame('image1_preview.jpg', $file->getPreview()->getOriginalFilename());
     }
 
-    public function testPreviewWrite()
+    public function testPreviewWrite(): void
     {
         $file = $this->manager->upload(new SplFileInfo(__DIR__.'/../../files/image1.jpg'));
         assert($file instanceof FileWithPreview);
@@ -61,7 +61,7 @@ public function testPreviewWrite()
         self::assertNotSame($preview1, $file->getPreview());
     }
 
-    public function testPreviewWriteStream()
+    public function testPreviewWriteStream(): void
     {
         $file = $this->manager->upload(new SplFileInfo(__DIR__.'/../../files/image1.jpg'));
         assert($file instanceof FileWithPreview);

diff --git a/tests/Functional/Preview/PreviewGeneratorTest.php b/tests/Functional/Preview/PreviewGeneratorTest.php
@@ -20,7 +20,7 @@ protected static function getBundles(): array
         return [];
     }
 
-    public function testImagePreview()
+    public function testImagePreview(): void
     {
         $file = $this->manager->upload(new SplFileInfo(__DIR__.'/../../files/image1.jpg'));
         assert($file instanceof FileWithPreview);
@@ -45,7 +45,7 @@ public function testImagePreview()
 //        self::assertSame('image1_preview.jpg', $file->getPreview()->getOriginalFilename());
     }
 
-    public function testPreviewWrite()
+    public function testPreviewWrite(): void
     {
         $file = $this->manager->upload(new SplFileInfo(__DIR__.'/../../files/image1.jpg'));
         assert($file instanceof FileWithPreview);
@@ -61,7 +61,7 @@ public function testPreviewWrite()
         self::assertNotSame($preview1, $file->getPreview());
     }
 
-    public function testPreviewWriteStream()
+    public function testPreviewWriteStream(): void
     {
         $file = $this->manager->upload(new SplFileInfo(__DIR__.'/../../files/image1.jpg'));
         assert($file instanceof FileWithPreview);
@@ -79,7 +79,7 @@ public function testPreviewWriteStream()
         self::assertNotSame($preview1, $file->getPreview());
     }
 
-    public function testNotSupportedFile()
+    public function testNotSupportedFile(): void
     {
         $file = $this->manager->upload(new SplFileInfo(__DIR__.'/../../files/lorem-ipsum.pdf'));
         assert($file instanceof FileWithPreview);