Merge e27ba3d into a868e1d

spatie · Sep 4, 2019 · adb7cf7 · adb7cf7
2 parents a868e1d + e27ba3d
commit adb7cf7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/Macros/FirstOrFail.php b/src/Macros/FirstOrFail.php
@@ -2,7 +2,6 @@
 
 namespace Spatie\CollectionMacros\Macros;
 
-use Illuminate\Support\Collection;
 use Spatie\CollectionMacros\Exceptions\CollectionItemNotFound;
 
 /**

diff --git a/src/Macros/FromPairs.php b/src/Macros/FromPairs.php
@@ -17,7 +17,7 @@ public function __invoke()
     {
         return function (): Collection {
             return $this->reduce(function ($assoc, array $keyValuePair): Collection {
-                list($key, $value) = $keyValuePair;
+                [$key, $value] = $keyValuePair;
                 $assoc[$key] = $value;
 
                 return $assoc;

diff --git a/src/Macros/SliceBefore.php b/src/Macros/SliceBefore.php
@@ -29,7 +29,7 @@ public function __invoke()
                 ]);
 
                 return $this->eachCons(2)->reduce(function ($sliced, $previousAndCurrent) use ($callback) {
-                    list($previousItem, $item) = $previousAndCurrent;
+                    [$previousItem, $item] = $previousAndCurrent;
 
                     $callback($item, $previousItem)
                         ? $sliced->push(new static([$item]))

diff --git a/tests/Macros/GroupByModelTest.php b/tests/Macros/GroupByModelTest.php
@@ -12,7 +12,7 @@ class GroupByModelTest extends TestCase
     /** @test */
     public function it_can_group_a_collection_by_a_model_with_a_callable()
     {
-        list($model1, $model2, $collection) = $this->getDummies();
+        [$model1, $model2, $collection] = $this->getDummies();
 
         $expected = [
             [$model1, [
@@ -39,7 +39,7 @@ public function it_can_group_a_collection_by_a_model_with_a_callable()
     /** @test */
     public function it_can_group_a_collection_by_a_model_with_a_callable_and_custom_key_names()
     {
-        list($model1, $model2, $collection) = $this->getDummies();
+        [$model1, $model2, $collection] = $this->getDummies();
 
         $grouped = $collection->groupByModel(function ($item) {
             return $item['model'];
@@ -71,7 +71,7 @@ public function it_can_group_a_collection_by_a_model_with_a_callable_and_custom_
     /** @test */
     public function it_can_group_a_collection_by_a_model_with_a_key()
     {
-        list($model1, $model2, $collection) = $this->getDummies();
+        [$model1, $model2, $collection] = $this->getDummies();
 
         $grouped = $collection->groupByModel('model');
 
@@ -96,7 +96,7 @@ public function it_can_group_a_collection_by_a_model_with_a_key()
     /** @test */
     public function it_can_group_a_collection_by_a_model_with_a_key_and_custom_key_names()
     {
-        list($model1, $model2, $collection) = $this->getDummies();
+        [$model1, $model2, $collection] = $this->getDummies();
 
         $grouped = $collection->groupByModel('model', false, 'myKey', 'items');
 
@@ -126,7 +126,7 @@ public function it_can_group_a_collection_by_a_model_with_a_key_and_custom_key_n
     /** @test */
     public function it_can_group_a_collection_by_a_model_with_a_key_and_a_custom_items_key()
     {
-        list($model1, $model2, $collection) = $this->getDummies();
+        [$model1, $model2, $collection] = $this->getDummies();
 
         $grouped = $collection->groupByModel('model', false, 'model', 'myItems');
 
@@ -156,7 +156,7 @@ public function it_can_group_a_collection_by_a_model_with_a_key_and_a_custom_ite
     /** @test */
     public function it_can_group_a_collection_by_a_model_and_preserve_keys()
     {
-        list($model1, $model2, $collection) = $this->getDummies();
+        [$model1, $model2, $collection] = $this->getDummies();
 
         $grouped = $collection->groupByModel('model', true, 'model', 'items');