Fix phpstan errors (#3472)

spatie · Dec 21, 2023 · 32da8cc · 32da8cc
1 parent 0d1547c
commit 32da8cc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -9,11 +9,6 @@ parameters:
 			path: src/MediaCollections/Models/Media.php
 
 		-
-			message: "#^Call to an undefined method Spatie\\\\Image\\\\Manipulations\\:\\:save\\(\\)\\.$#"
+			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Builder\\:\\:withTrashed\\(\\)\\.$#"
 			count: 1
-			path: src/ResponsiveImages/ResponsiveImageGenerator.php
-
-		-
-			message: "#^Call to an undefined method Spatie\\\\Image\\\\Manipulations\\:\\:save\\(\\)\\.$#"
-			count: 1
-			path: src/ResponsiveImages/TinyPlaceholderGenerator/Blurred.php
+			path: src/MediaCollections/MediaRepository.php
diff --git a/src/Conversions/Conversion.php b/src/Conversions/Conversion.php
@@ -36,9 +36,8 @@ public function __construct(
     ) {
         $optimizerChain = OptimizerChainFactory::create(config('media-library.image_optimizers'));
 
-        $this->manipulations = (new Manipulations())
-            ->optimize($optimizerChain)
-            ->format('jpg');
+        $this->manipulations = new Manipulations();
+        $this->manipulations->optimize($optimizerChain)->format('jpg');
 
         $this->fileNamer = app(config('media-library.file_namer'));
 

diff --git a/src/Conversions/Manipulations.php b/src/Conversions/Manipulations.php
@@ -56,6 +56,15 @@ public function apply(ImageDriver $image): void
         }
     }
 
+    public function mergeManipulations(self $manipulations): self
+    {
+        foreach ($manipulations->toArray() as $name => $parameters) {
+            $this->manipulations[$name] = array_merge($this->manipulations[$name] ?? [], $parameters ?: []);
+        }
+
+        return $this;
+    }
+
     public function removeManipulation(string $name): self
     {
         unset($this->manipulations[$name]);

diff --git a/src/MediaCollections/Exceptions/InvalidFileRemover.php b/src/MediaCollections/Exceptions/InvalidFileRemover.php
@@ -12,7 +12,7 @@ public static function doesntExist(string $class): self
         return new static("File remover class `{$class}` doesn't exist");
     }
 
-    public static function doesNotImplementPathGenerator(string $class): self
+    public static function doesNotImplementFileRemover(string $class): self
     {
         $fileRemoverClass = FileRemover::class;