Merge branch hotfix/v2.7.6

Author: roadiz-ci

composer.json

@@ -30,27 +30,27 @@
         "intervention/image": "^3.11",
         "league/flysystem": "^3.0",
         "monolog/monolog": "^3.9",
-        "symfony/asset": "7.3.*",
-        "symfony/console": "7.3.*",
-        "symfony/event-dispatcher": "7.3.*",
+        "symfony/asset": "7.4.*",
+        "symfony/console": "7.4.*",
+        "symfony/event-dispatcher": "7.4.*",
         "symfony/filesystem": ">=7.1",
-        "symfony/finder": "7.3.*",
-        "symfony/http-foundation": "7.3.*",
+        "symfony/finder": "7.4.*",
+        "symfony/http-foundation": "7.4.*",
         "symfony/http-client-contracts": "^3.5",
-        "symfony/options-resolver": "7.3.*",
-        "symfony/serializer": "7.3.*",
+        "symfony/options-resolver": "7.4.*",
+        "symfony/serializer": "7.4.*",
         "twig/twig": "^3.21"
     },
     "require-dev": {
         "api-platform/metadata": "^4.1.18",
         "doctrine/doctrine-bundle": "^2.8.1",
         "php-coveralls/php-coveralls": "^2.4",
-        "phpstan/phpstan": "^1.5.3",
+        "phpstan/phpstan": "^2.1.36",
         "phpstan/phpdoc-parser": "<2",
-        "phpstan/phpstan-doctrine": "^1.3",
+        "phpstan/phpstan-doctrine": "^2.0.13",
         "phpunit/phpunit": "^9.6",
-        "symfony/http-client": "7.3.*",
-        "symfony/process": "7.3.*"
+        "symfony/http-client": "7.4.*",
+        "symfony/process": "7.4.*"
     },
     "autoload": {
         "psr-4": {
@@ -70,8 +70,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6.x-dev",
-            "dev-develop": "2.7.x-dev"
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
         }
     }
 }

src/AbstractDocumentFactory.php

@@ -111,7 +111,10 @@ public function getDocument(bool $allowEmpty = false, bool $allowDuplicates = fa
         }
 
         if (null === $file) {
-            return null;
+            $document = $this->createDocument();
+            $this->persistDocument($document);
+
+            return $document;
         }
 
         if ($file instanceof UploadedFile && !$file->isValid()) {

src/ArrayDocumentFinder.php

@@ -52,7 +52,7 @@ public function findOneByHashAndAlgorithm(string $hash, string $algorithm): ?Doc
     /**
      * @return $this
      */
-    public function addDocument(DocumentInterface $document): self
+    public function addDocument(DocumentInterface $document): static
     {
         if (!$this->documents->contains($document)) {
             $this->documents->add($document);

src/Console/AbstractDocumentCommand.php

@@ -33,7 +33,7 @@ protected function getManager(): ObjectManager
     /**
      * @return DocumentRepositoryInterface<DocumentInterface>&EntityRepository<DocumentInterface>
      */
-    protected function getDocumentRepository(): DocumentRepositoryInterface
+    protected function getDocumentRepository(): DocumentRepositoryInterface&EntityRepository
     {
         $repository = $this->managerRegistry->getRepository(DocumentInterface::class);
         if (!$repository instanceof DocumentRepositoryInterface) {

src/DownscaleImageManager.php

@@ -41,7 +41,7 @@ public function processAndOverrideDocument(?DocumentInterface $document = null):
         $documentPath = $document->getMountPath();
         $processedImage = $this->getProcessedImage($documentPath);
 
-        if (null === $processedImage) {
+        if (null === $documentPath || null === $processedImage) {
             return;
         }
 
@@ -69,7 +69,7 @@ public function processDocumentFromExistingRaw(?DocumentInterface $document = nu
 
         $processedImage = $this->getProcessedImage($documentPath);
 
-        if (null === $processedImage) {
+        if (null === $documentPath || null === $processedImage) {
             return;
         }
 
@@ -195,8 +195,13 @@ private function storeNewProcessedImage(DocumentInterface $document, ImageInterf
      */
     private function writeNewProcessedImage(DocumentInterface $document, ImageInterface $image): void
     {
+        $mountPath = $document->getMountPath();
+        if (null === $mountPath) {
+            return;
+        }
+
         $this->documentsStorage->write(
-            $document->getMountPath(),
+            $mountPath,
             $image->encode(new AutoEncoder(quality: 100))->toString()
         );
     }
@@ -247,7 +252,10 @@ private function updateDocumentFileHash(DocumentInterface $document): void
      */
     private function overwriteExistingProcessedImage(DocumentInterface $document, ImageInterface $image): DocumentInterface
     {
-        $this->documentsStorage->delete($document->getMountPath());
+        if (null === $mountPath = $document->getMountPath()) {
+            return $document;
+        }
+        $this->documentsStorage->delete($mountPath);
         $this->writeNewProcessedImage($document, $image);
         $this->updateDocumentImageSize($document, $image);
         $this->updateDocumentFileHash($document);
@@ -269,6 +277,8 @@ private function generateRawFilename(string $filename): string
 
     /**
      * Check if a document is valid for processing.
+     *
+     * @phpstan-assert-if-true DocumentInterface $document
      */
     private function isValidDocument(?DocumentInterface $document): bool
     {

src/MediaFinders/AbstractEmbedFinder.php

@@ -368,7 +368,7 @@ public function getKey(): ?string
      *
      * @return $this
      */
-    public function setKey(?string $key): self
+    public function setKey(?string $key): static
     {
         $this->key = $key;
 

src/MediaFinders/EmbedFinderFactory.php

@@ -27,7 +27,7 @@ public function __construct(
 
     public function createForPlatform(?string $mediaPlatform, ?string $embedId): ?EmbedFinderInterface
     {
-        if (null !== $embedId && $this->supports($mediaPlatform)) {
+        if (null !== $embedId && null !== $mediaPlatform && $this->supports($mediaPlatform)) {
             /**
              * @var class-string<EmbedFinderInterface> $class
              */
@@ -44,10 +44,6 @@ public function createForUrl(?string $embedUrl): ?EmbedFinderInterface
         if (null === $embedUrl) {
             throw new \InvalidArgumentException('"embedUrl" is required');
         }
-        // Throws a BadRequestHttpException if the embedUrl is not a string
-        if (!is_string($embedUrl)) {
-            throw new \InvalidArgumentException('"embedUrl" must be a string');
-        }
         // Throws a BadRequestHttpException if the embedUrl is not a valid URL
         if (!filter_var($embedUrl, FILTER_VALIDATE_URL)) {
             throw new \InvalidArgumentException('"embedUrl" is not a valid URL');

src/Models/BaseDocumentTrait.php

@@ -174,8 +174,9 @@ public function getMountPath(): ?string
         Serializer\SerializedName('type'),]
     public function getShortType(): string
     {
-        if (null !== $this->getMimeType() && isset(static::$mimeToIcon[$this->getMimeType()])) {
-            return static::$mimeToIcon[$this->getMimeType()];
+        $mimeType = (string) $this->getMimeType();
+        if ('' !== $mimeType && isset(static::$mimeToIcon[$mimeType])) {
+            return static::$mimeToIcon[$mimeType];
         }
 
         return 'unknown';
@@ -274,6 +275,9 @@ public function getAlternativeText(): ?string
 
     /**
      * Return false if no local file is linked to document. i.e no filename, no folder.
+     *
+     * @phpstan-assert-if-true non-empty-string $this->getMountPath()
+     * @phpstan-assert-if-true non-empty-string $this->getRelativePath()
      */
     #[Serializer\Ignore()]
     public function isLocal(): bool

src/Models/ContextualizedDocumentInterface.php

@@ -11,19 +11,19 @@ public function getDocument(): DocumentInterface;
     /**
      * @return $this
      */
-    public function setDocument(DocumentInterface $document): self;
+    public function setDocument(DocumentInterface $document): static;
 
     public function getImageCropAlignment(): ?string;
 
     /**
      * @return $this
      */
-    public function setImageCropAlignment(?string $imageCropAlignment): self;
+    public function setImageCropAlignment(?string $imageCropAlignment): static;
 
     public function getHotspot(): ?array;
 
     /**
      * @return $this
      */
-    public function setHotspot(?array $hotspot): self;
+    public function setHotspot(?array $hotspot): static;
 }

src/Models/ContextualizedDocumentTrait.php

@@ -47,7 +47,10 @@ public function getDocument(): DocumentInterface
         return $this->document;
     }
 
-    public function setDocument(DocumentInterface $document): self
+    /**
+     * @return $this
+     */
+    public function setDocument(DocumentInterface $document): static
     {
         $this->document = $document;
 
@@ -59,7 +62,10 @@ public function getImageCropAlignment(): ?string
         return $this->imageCropAlignment;
     }
 
-    public function setImageCropAlignment(?string $imageCropAlignment): self
+    /**
+     * @return $this
+     */
+    public function setImageCropAlignment(?string $imageCropAlignment): static
     {
         $this->imageCropAlignment = $imageCropAlignment;
 
@@ -71,7 +77,10 @@ public function getHotspot(): ?array
         return $this->hotspot;
     }
 
-    public function setHotspot(?array $hotspot): self
+    /**
+     * @return $this
+     */
+    public function setHotspot(?array $hotspot): static
     {
         $this->hotspot = $hotspot;