Merge pull request #3726 from spatie/revert-pr-3715

Revert PR #3715
spatie · Nov 15, 2024 · 2e6aa4f · 2e6aa4f
2 parents 9acf3f1 + 7174f6e
commit 2e6aa4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 106 deletions.
diff --git a/src/Conversions/ConversionCollection.php b/src/Conversions/ConversionCollection.php
@@ -38,9 +38,7 @@ public function setMedia(Media $media): self
 
     public function getByName(string $name): Conversion
     {
-        $conversion = $this
-            ->getConversions($this->media->collection_name)
-            ->first(fn (Conversion $conversion) => $conversion->getName() === $name);
+        $conversion = $this->first(fn (Conversion $conversion) => $conversion->getName() === $name);
 
         if (! $conversion) {
             throw InvalidConversion::unknownName($name);
@@ -91,9 +89,7 @@ public function getConversions(string $collectionName = ''): self
             return $this;
         }
 
-        return $this
-            ->filter(fn (Conversion $conversion) => $conversion->shouldBePerformedOn($collectionName))
-            ->values();
+        return $this->filter(fn (Conversion $conversion) => $conversion->shouldBePerformedOn($collectionName));
     }
 
     protected function addManipulationToConversion(Manipulations $manipulations, string $conversionName): void
@@ -117,7 +113,7 @@ protected function addManipulationToConversion(Manipulations $manipulations, str
 
         if ($conversionName === '*') {
             $this->each(
-                fn (Conversion $conversion) => $conversion->addAsFirstManipulations(clone $manipulations),
+                fn (Conversion $conversion) => $conversion->addAsFirstManipulations(clone $manipulations)
             );
         }
     }

diff --git a/tests/Conversions/ConversionCollectionConversionsTest.php b/tests/Conversions/ConversionCollectionConversionsTest.php