replace Mutable::push with Mutable::add method, solve Laravel version…

… compatibility
adminarchitect · Oct 7, 2020 · 868402b · 868402b
1 parent aa75174
commit 868402b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 26 deletions.
diff --git a/src/Collection/Mutable.php b/src/Collection/Mutable.php
@@ -12,23 +12,21 @@
 class Mutable extends BaseCollection
 {
     /**
-     * Push an item onto the end of the collection.
+     * Add an element to the collection.
      *
-     * @param mixed $values [optional]
+     * @param mixed $element
+     * @param Closure $callback
      * @return $this
      */
-    public function push(...$values)
+    public function add($element, Closure $callback = null)
     {
-        $element = $values[0] ?? null;
-        $callback = $values[1] ?? null;
-
         $element = $this->createElement($element);
 
-        if ($callback instanceof Closure) {
+        if ($callback) {
             $callback($element);
         }
 
-        parent::push($element);
+        parent::add($element);
 
         return $this;
     }
@@ -51,13 +49,13 @@ public function insert($element, $position, Closure $callback = null): self
         }
 
         if (\is_string($position)) {
-            $this->push($element);
+            $this->add($element);
 
             return $this->move($element->id(), $position);
         }
 
         if ($position >= $this->count()) {
-            return $this->push($element);
+            return $this->add($element);
         }
 
         if (0 === $position) {
@@ -267,7 +265,7 @@ public function group(string $id, Closure $callback): self
 
         $callback($group);
 
-        $this->push($group);
+        $this->add($group);
 
         return $this;
     }
@@ -295,7 +293,7 @@ public function stack(array $elements, string $groupId, $position = null): self
         if ($position) {
             $this->insert($group, $position);
         } else {
-            $this->push($group);
+            $this->add($group);
         }
 
         return $this;

diff --git a/src/Traits/Module/HasFilters.php b/src/Traits/Module/HasFilters.php
@@ -42,7 +42,7 @@ trait HasFilters
      */
     public function addFilter(Filter $filter)
     {
-        $this->filters->push($filter);
+        $this->filters->add($filter);
 
         return $this;
     }
@@ -55,7 +55,7 @@ public function addFilter(Filter $filter)
      */
     public function addScope(Scope $scope)
     {
-        $this->scopes->push($scope);
+        $this->scopes->add($scope);
 
         return $this;
     }

diff --git a/src/Traits/Module/HasOptions.php b/src/Traits/Module/HasOptions.php
@@ -27,10 +27,7 @@ protected function scaffoldForm()
 
         foreach (options_fetch() as $option) {
             $element = Text::make($option->key)->setValue($option->value);
-
-            $collection->push(
-                $element
-            );
+            $collection->add($element);
         }
 
         return $collection;

diff --git a/tests/Collection/MutableTest.php b/tests/Collection/MutableTest.php
@@ -45,7 +45,7 @@ public function it_initializes_a_collection()
     /** @test */
     public function it_pushes_an_element()
     {
-        $this->collection->push('test', function ($e) {
+        $this->collection->add('test', function ($e) {
             return $e;
         });
 
@@ -293,8 +293,8 @@ protected function makeElementsCollection()
         $collection = (new Mutable());
 
         return $collection
-            ->push($this->e('first'))
-            ->push($this->e('second'))
-            ->push($this->e('third'));
+            ->add($this->e('first'))
+            ->add($this->e('second'))
+            ->add($this->e('third'));
     }
 }
diff --git a/tests/Form/Collection/FormCollectionMutableTest.php b/tests/Form/Collection/FormCollectionMutableTest.php
@@ -23,7 +23,7 @@ public function setUp()
     public function it_creates_a_form_element_from_string_id()
     {
         $collection = new Mutable();
-        $collection->push('title');
+        $collection->add('title');
 
         $this->assertCount(1, $collection->all());
         $this->assertInstanceOf(Text::class, $collection->find('title'));
@@ -60,8 +60,8 @@ public function it_creates_a_form_element_from_object()
         $collection = new Mutable();
 
         $collection
-            ->push($title = Text::make('title'))
-            ->push($body = Textarea::make('body'));
+            ->add($title = Text::make('title'))
+            ->add($body = Textarea::make('body'));
 
         $this->assertCount(2, $collection->all());
         $this->assertSame([$title, $body], $collection->all());
@@ -79,7 +79,7 @@ public function it_creates_a_form_element_from_object()
      */
     public function it_allows_editing_of_new_created_element($collection)
     {
-        $collection->push(
+        $collection->add(
             $desc = Textarea::make('description'),
             function (Textarea $element) {
                 $element->setTitle('New description');