Merge tag v2.2.12 into develop

roadiz · Mar 8, 2024 · 269bfbb · 269bfbb
1 parent 0919a6e
commit 269bfbb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 397 deletions.
diff --git a/src/Exceptions/PrivateDocumentException.php b/src/Exceptions/PrivateDocumentException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RZ\Roadiz\Documents\Exceptions;
+
+final class PrivateDocumentException extends \InvalidArgumentException
+{
+}
diff --git a/src/Packages.php b/src/Packages.php
diff --git a/src/Renderer/AbstractImageRenderer.php b/src/Renderer/AbstractImageRenderer.php
@@ -97,7 +97,12 @@ protected function parseSrcSetInner(
     ): string {
         $output = [];
         foreach ($srcSetArray as $set) {
-            if (isset($set['format']) && isset($set['rule']) && !empty($document->getRelativePath())) {
+            if (
+                isset($set['format']) &&
+                isset($set['rule']) &&
+                !$document->isPrivate() &&
+                !empty($document->getRelativePath())
+            ) {
                 $this->documentUrlGenerator->setOptions($this->urlOptionsResolver->resolve($set['format']));
                 $this->documentUrlGenerator->setDocument($document);
                 $path = $this->documentUrlGenerator->getUrl($absolute);

diff --git a/src/Renderer/VideoRenderer.php b/src/Renderer/VideoRenderer.php
@@ -78,7 +78,7 @@ protected function getPosterUrl(
             $document->hasThumbnails()
         ) {
             $thumbnail = $document->getThumbnails()->first();
-            if ($thumbnail instanceof DocumentInterface) {
+            if (false !== $thumbnail) {
                 $this->documentUrlGenerator->setOptions($options);
                 $this->documentUrlGenerator->setDocument($thumbnail);
                 return $this->documentUrlGenerator->getUrl($absolute);