fix method chaining of convenience methods

Author: freekmurze

CHANGELOG.md

@@ -2,7 +2,10 @@
 
 All Notable changes to `laravel-medialibrary` will be documented in this file
 
-##3.1.3
+##3.1.4
+- Fixed a bug where chaining the conversion convenience methods would not give the right result
+
+##3.1.3gti i
 - Fixed a bug where getByModelType would return null
 
 ##3.1.2

src/Conversion/Conversion.php

@@ -321,7 +321,17 @@ public function setRectangle($width, $height, $x, $y)
      */
     public function setManipulationParameter($name, $value)
     {
-        $this->manipulations[count($this->manipulations)][$name] = $value;
+        if (count($this->manipulations) == 0) {
+            $this->manipulations[0] = [];
+        };
+
+        $lastIndex = count($this->manipulations) - 1;
+
+        if (!isset($this->manipulations[$lastIndex])) {
+            $this->manipulations[$lastIndex] = [];
+        }
+
+        $this->manipulations[$lastIndex] = array_merge($this->manipulations[$lastIndex], [$name => $value]);
 
         return $this;
     }

src/MediaRepository.php

@@ -122,6 +122,7 @@ public function all()
      * Get all media for the given type.
      *
      * @param string $modelType
+     *
      * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getByModelType($modelType)

tests/Conversion/ConversionTest.php

@@ -248,4 +248,16 @@ public function it_can_add_a_parameter_to_a_manipulation()
         $this->assertEquals('value', $this->conversion->getManipulations()[0]['name']);
         $this->assertInstanceOf(\Spatie\MediaLibrary\Conversion\Conversion::class, $conversion);
     }
+
+    /**
+     * @test
+     */
+    public function it_can_chain_the_convenience_methods()
+    {
+        $conversion = $this->conversion->setWidth(75)->setHeight(75)->setFit('crop')->setFormat('jpg');
+
+        $otherConversions = (new Conversion('other'))->setManipulations(['w' => 75, 'h' => 75, 'fit' => 'crop', 'fm' => 'jpg']);
+
+        $this->assertEquals($conversion->getManipulations(), $otherConversions->getManipulations());
+    }
 }