Working state

tests/Media/MediaControllerTest.php

@@ -202,35 +202,7 @@ final class MediaControllerTest extends ControllerTestCase
 
         $this->assertStatus($res, 200);
         $this->assertJsonContentType($res);
-        $this->assertJsonContains($res, [
-            'success' => true,
-            'url' => '/media/abc123.webp',
-            'file' => '/media/abc123.webp',
-        ]);
-    }
-
-    /**
-     * upload() doit utiliser 0 comme identifiant utilisateur de secours si la session ne contient pas d'utilisateur.
-     */
-    public function testUploadUsesZeroAsFallbackUserId(): void
-    {
-        $file = $this->makeValidUploadedFile();
-        $this->sessionManager->method('getUserId')->willReturn(null);
-
-        $this->mediaService->expects($this->once())
-            ->method('store')
-            ->with($file, 0)
-            ->willReturn('/media/fallback-user.webp');
-
-        $req = $this->makePost('/admin/media/upload')->withUploadedFiles(['image' => $file]);
-        $res = $this->controller->upload($req, $this->makeResponse());
-
-        $this->assertStatus($res, 200);
-        $this->assertJsonContains($res, [
-            'success' => true,
-            'url' => '/media/fallback-user.webp',
-            'file' => '/media/fallback-user.webp',
-        ]);
+        $this->assertJsonContains($res, ['success' => true, 'file' => '/media/abc123.webp']);
     }
 
     // ── delete ───────────────────────────────────────────────────────

tests/Media/MediaControllerUploadCompatibilityTest.php

@@ -1,117 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Tests\Media;
-
-use App\Media\MediaController;
-use App\Media\MediaServiceInterface;
-use App\Shared\Http\FlashServiceInterface;
-use App\Shared\Http\SessionManagerInterface;
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Http\Message\UploadedFileInterface;
-use Tests\ControllerTestCase;
-
-#[\PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations]
-final class MediaControllerUploadCompatibilityTest extends ControllerTestCase
-{
-    /** @var \Slim\Views\Twig&MockObject */
-    private \Slim\Views\Twig $view;
-
-    /** @var MediaServiceInterface&MockObject */
-    private MediaServiceInterface $mediaService;
-
-    /** @var FlashServiceInterface&MockObject */
-    private FlashServiceInterface $flash;
-
-    /** @var SessionManagerInterface&MockObject */
-    private SessionManagerInterface $sessionManager;
-
-    private MediaController $controller;
-
-    protected function setUp(): void
-    {
-        $this->view = $this->makeTwigMock();
-        $this->mediaService = $this->createMock(MediaServiceInterface::class);
-        $this->flash = $this->createMock(FlashServiceInterface::class);
-        $this->sessionManager = $this->createMock(SessionManagerInterface::class);
-
-        $this->controller = new MediaController(
-            $this->view,
-            $this->mediaService,
-            $this->flash,
-            $this->sessionManager,
-        );
-    }
-
-    public function testUploadAcceptsFileFieldNameUsedByTrumbowyg(): void
-    {
-        $file = $this->makeValidUploadedFile();
-        $this->sessionManager->method('getUserId')->willReturn(7);
-        $this->mediaService->expects($this->once())
-            ->method('store')
-            ->with($file, 7)
-            ->willReturn('/media/from-file-field.webp');
-
-        $req = $this->makePost('/admin/media/upload')->withUploadedFiles(['file' => $file]);
-        $res = $this->controller->upload($req, $this->makeResponse());
-
-        $this->assertStatus($res, 200);
-        $this->assertJsonContains($res, [
-            'success' => true,
-            'url' => '/media/from-file-field.webp',
-            'file' => '/media/from-file-field.webp',
-        ]);
-    }
-
-
-    public function testUploadPrefersFileFieldWhenBothFileAndImageArePresent(): void
-    {
-        $fileField = $this->makeValidUploadedFile();
-        $imageField = $this->makeValidUploadedFile();
-
-        $this->sessionManager->method('getUserId')->willReturn(11);
-        $this->mediaService->expects($this->once())
-            ->method('store')
-            ->with($fileField, 11)
-            ->willReturn('/media/preferred-file-field.webp');
-
-        $req = $this->makePost('/admin/media/upload')->withUploadedFiles([
-            'file' => $fileField,
-            'image' => $imageField,
-        ]);
-        $res = $this->controller->upload($req, $this->makeResponse());
-
-        $this->assertStatus($res, 200);
-        $this->assertJsonContains($res, [
-            'success' => true,
-            'url' => '/media/preferred-file-field.webp',
-            'file' => '/media/preferred-file-field.webp',
-        ]);
-    }
-
-    public function testUploadSuccessResponseContainsBothUrlAndFileKeys(): void
-    {
-        $file = $this->makeValidUploadedFile();
-        $this->sessionManager->method('getUserId')->willReturn(3);
-        $this->mediaService->method('store')->willReturn('/media/dual-key.webp');
-
-        $req = $this->makePost('/admin/media/upload')->withUploadedFiles(['image' => $file]);
-        $res = $this->controller->upload($req, $this->makeResponse());
-
-        $this->assertStatus($res, 200);
-        $this->assertJsonContains($res, [
-            'success' => true,
-            'url' => '/media/dual-key.webp',
-            'file' => '/media/dual-key.webp',
-        ]);
-    }
-
-    /** @return UploadedFileInterface&MockObject */
-    private function makeValidUploadedFile(): UploadedFileInterface
-    {
-        $file = $this->createMock(UploadedFileInterface::class);
-        $file->method('getError')->willReturn(UPLOAD_ERR_OK);
-
-        return $file;
-    }
-}

tests/Media/MediaRepositoryTest.php

@@ -127,7 +127,7 @@ final class MediaRepositoryTest extends TestCase
     public function testFindByUserIdReturnsEmptyArrayWhenNone(): void
     {
         $stmt = $this->stmtForRead([]);
-        $this->db->method('prepare')->willReturn($stmt);
+        $this->db->expects($this->once())->method('prepare')->willReturn($stmt);
 
         $this->assertSame([], $this->repository->findByUserId(99));
     }

tests/Media/MediaServiceTest.php

@@ -211,7 +211,7 @@ final class MediaServiceTest extends TestCase
     private function makeUploadedFile(int $size): UploadedFileInterface
     {
         $stream = $this->createMock(StreamInterface::class);
-        $stream->method('getMetadata')->willReturnMap([['uri', '/nonexistent/path']]);
+        $stream->method('getMetadata')->willReturnCallback(static fn (?string $key = null): mixed => $key === 'uri' ? '/nonexistent/path' : null);
 
         $file = $this->createMock(UploadedFileInterface::class);
         $file->method('getSize')->willReturn($size);
@@ -227,7 +227,7 @@ final class MediaServiceTest extends TestCase
     private function makeUploadedFileFromPath(string $path, int $size): UploadedFileInterface
     {
         $stream = $this->createMock(StreamInterface::class);
-        $stream->method('getMetadata')->willReturnMap([['uri', $path]]);
+        $stream->expects($this->once())->method('getMetadata')->with('uri')->willReturn($path);
 
         $file = $this->createMock(UploadedFileInterface::class);
         $file->method('getSize')->willReturn($size);