qa: remove all static callables

boesing · boesing · commit 69f98c568343 · 2023-04-14T11:50:00.000+02:00
Signed-off-by: Maximilian Bösing &lt;2189546+boesing@users.noreply.github.com&gt;
diff --git a/src/Array_.php b/src/Array_.php
@@ -84,7 +84,7 @@ public function count(): int
      */
     protected function valueComparator(): callable
     {
-        return static function ($a, $b): int {
+        return function ($a, $b): int {
             if (! is_object($a) || ! is_object($b)) {
                 return $a <=> $b;
             }
diff --git a/src/Map.php b/src/Map.php
@@ -112,7 +112,7 @@ public function diffKeys(MapInterface $other, ?callable $keyComparator = null):
      */
     private function keyComparator(): callable
     {
-        return static function (string $a, string $b): int {
+        return function (string $a, string $b): int {
             return strcmp($a, $b);
         };
     }
diff --git a/src/OrderedList.php b/src/OrderedList.php
@@ -188,7 +188,7 @@ public function toMap(callable $keyGenerator): MapInterface
     public function removeElement($element): OrderedListInterface
     {
         return $this->filter(
-            static function ($value) use ($element): bool {
+            function ($value) use ($element): bool {
                 return $value !== $element;
             },
         );
@@ -224,7 +224,7 @@ public function unify(
          * @psalm-var callable(mixed):non-empty-string $unificationIdentifierGenerator
          */
         $unificationIdentifierGenerator = $unificationIdentifierGenerator
-            ?? static fn ($value): string => hash('sha256', serialize($value));
+            ?? fn ($value): string => hash('sha256', serialize($value));
 
         $instance = clone $this;
 
@@ -300,7 +300,7 @@ private function createListFilledWithValues(int $start, int $amount, $value): ar
              * @psalm-suppress MissingClosureReturnType We have to assume that the value contains the fill value.
              * @return TValue
              */
-            $callable = static fn () => $value;
+            $callable = fn () => $value;
         }
 
         for ($index = $start; $index < $amount; $index++) {
@@ -469,6 +469,6 @@ public function prepend($value): OrderedListInterface
 
     public function removeAt(int $index): OrderedListInterface
     {
-        return $this->filter(static fn ($_, int $i) => $i !== $index);
+        return $this->filter(fn ($_, int $i) => $i !== $index);
     }
 }
diff --git a/tests/ForAllPromiseTest.php b/tests/ForAllPromiseTest.php
@@ -12,7 +12,7 @@ final class ForAllPromiseTest extends TestCase
     public function testWillNotExecuteTwiceDueToDestructionOfObject(): void
     {
         $executed = false;
-        $task     = static function () use (&$executed): void {
+        $task     = function () use (&$executed): void {
             self::assertFalse($executed, 'Task was executed more than once!');
             $executed = true;
         };
diff --git a/tests/GenericMapTest.php b/tests/GenericMapTest.php
@@ -46,7 +46,7 @@ public function exchangeKeys(): Generator
                 'bar' => 'baz',
                 'qoo' => 'ooq',
             ],
-            static function (string $key): string {
+            function (string $key): string {
                 switch ($key) {
                     case 'foo':
                         return 'bar';
@@ -73,7 +73,7 @@ static function (string $key): string {
                 'bar' => 'baz',
                 'qoo' => 'ooq',
             ],
-            static function (string $key): string {
+            function (string $key): string {
                 switch ($key) {
                     case 'foo':
                         return 'fooo';
@@ -100,7 +100,7 @@ static function (string $key): string {
                 'bar' => 'baz',
                 'qoo' => 'ooq',
             ],
-            static function (string $key): string {
+            function (string $key): string {
                 switch ($key) {
                     case 'bar':
                     case 'foo':
@@ -143,7 +143,7 @@ public function testWillMerge(
 
         /** @psalm-var list<MapInterface<string,mixed>> $stackOfMaps */
         $stackOfMaps = array_map(
-            static function (array $map): MapInterface {
+            function (array $map): MapInterface {
                 return new GenericMap($map);
             },
             $stack,
@@ -224,7 +224,7 @@ public function sorting(): Generator
                 'bar' => 'baz',
                 'baz' => 'qoo',
             ],
-            static function (string $a, string $b): int {
+            function (string $a, string $b): int {
                 return strnatcmp($b, $a);
             },
             [
@@ -300,7 +300,7 @@ public function testWillMapValues(): void
             'second' => $object2,
         ]);
 
-        $mapped = $map->map(static function (GenericObject $object): int {
+        $mapped = $map->map(function (GenericObject $object): int {
             return $object->id;
         });
 
@@ -349,7 +349,7 @@ public function orderedLists(): Generator
                 1,
                 2,
             ],
-            static function (int $a, int $b): int {
+            function (int $a, int $b): int {
                 return $a <=> $b;
             },
         ];
@@ -406,7 +406,7 @@ public function testAssocIntersectionReturnExpectedValuesWhenCustomComparatorWas
             'ooq' => 'qoo',
         ]);
 
-        self::assertEquals(['foo' => 'bar'], $map1->intersectAssoc($map2, static function (string $a, string $b): int {
+        self::assertEquals(['foo' => 'bar'], $map1->intersectAssoc($map2, function (string $a, string $b): int {
             return trim($a) <=> trim($b);
         })->toNativeArray());
     }
@@ -447,7 +447,7 @@ public function testIntersectionWithKeysReturnExpectedValuesWhenCustomComparator
         self::assertEquals([
             'foo' => 'bar',
             'bar' => 'baz',
-        ], $map1->intersectUsingKeys($map2, static function (string $a, string $b): int {
+        ], $map1->intersectUsingKeys($map2, function (string $a, string $b): int {
             return strlen($a) <=> strlen($b);
         })->toNativeArray());
     }
@@ -553,19 +553,19 @@ public function diffs(): Generator
             ],
             ['object2' => $object2],
             ['object1' => $object1],
-            static function (object $a, object $b): int {
+            function (object $a, object $b): int {
                 return $a->id <=> $b->id;
             },
         ];
     }
 
     public function testCanIntersectWithUserFunctions(): void
     {
-        $keyComparator = static function (string $a, string $b): int {
+        $keyComparator = function (string $a, string $b): int {
             return $a <=> $b;
         };
 
-        $valueComparator = static function (string $a, string $b): int {
+        $valueComparator = function (string $a, string $b): int {
             return $a <=> $b;
         };
 
@@ -651,7 +651,7 @@ public function partitions(): Generator
                 'bar' => 'baz',
                 'qoo' => 'ooq',
             ],
-            static function (): bool {
+            function (): bool {
                 return true;
             },
             [
@@ -668,7 +668,7 @@ static function (): bool {
                 'bar' => 'baz',
                 'qoo' => 'ooq',
             ],
-            static function (): bool {
+            function (): bool {
                 return false;
             },
             [],
@@ -685,7 +685,7 @@ static function (): bool {
                 'bar' => 'baz',
                 'qoo' => 'ooq',
             ],
-            static function (string $value): bool {
+            function (string $value): bool {
                 return in_array($value, ['baz', 'ooq'], true);
             },
             [
@@ -704,7 +704,7 @@ public function testWillFilter(): void
         ]);
 
         $filtered = $map->filter(
-            static function (string $value): bool {
+            function (string $value): bool {
                 return $value === 'bar';
             },
         );
@@ -722,7 +722,7 @@ public function testWillGroupValuesToNewInstancesOfInitialInstance(): void
             'bar' => $object2 = new GenericObject(2),
         ]);
 
-        $grouped = $map->group(static function (GenericObject $object): string {
+        $grouped = $map->group(function (GenericObject $object): string {
             return $object->id % 2 ? 'a' : 'b';
         });
 
@@ -753,15 +753,15 @@ public function testElementsWontSatisfyCallback(): void
     {
         $map = new GenericMap(['foo' => 'bar']);
 
-        self::assertFalse($map->allSatisfy(static function (): bool {
+        self::assertFalse($map->allSatisfy(function (): bool {
             return false;
         }));
     }
 
     public function testEmptyMapWillSatisfyCallback(): void
     {
         $map = new GenericMap([]);
-        self::assertTrue($map->allSatisfy(static function (): bool {
+        self::assertTrue($map->allSatisfy(function (): bool {
             return false;
         }));
     }
@@ -776,7 +776,7 @@ public function satisfactions(): Generator
                 'one' => 1,
                 'another one' => 1,
             ],
-            static function (int $value): bool {
+            function (int $value): bool {
                 return $value === 1;
             },
         ];
@@ -786,7 +786,7 @@ static function (int $value): bool {
                 'foo' => 'foo',
                 'bar' => 'foo',
             ],
-            static function (string $value): bool {
+            function (string $value): bool {
                 return strlen($value) === 3;
             },
         ];
@@ -808,7 +808,7 @@ public function testWillFindExistenceOfEntry(array $data, callable $callback, bo
     public function testEmptyMapWontFindExistence(): void
     {
         $map = new GenericMap();
-        self::assertFalse($map->exists(static function (): bool {
+        self::assertFalse($map->exists(function (): bool {
             return true;
         }));
     }
@@ -824,7 +824,7 @@ public function existenceTests(): Generator
                 'two' => 2,
                 'another one' => 1,
             ],
-            static function (int $value): bool {
+            function (int $value): bool {
                 return $value === 2;
             },
             true,
@@ -836,7 +836,7 @@ static function (int $value): bool {
                 'two' => 2,
                 'three' => 3,
             ],
-            static function (int $value): bool {
+            function (int $value): bool {
                 // @codingStandardsIgnoreStart
                 return $value == '2';
                 // @codingStandardsIgnoreEnd
@@ -850,7 +850,7 @@ static function (int $value): bool {
                 'bar' => 'bar',
                 'baz' => 'baz',
             ],
-            static function (string $value): bool {
+            function (string $value): bool {
                 return $value === 'qoo';
             },
             false,
@@ -912,7 +912,7 @@ public function testForAllIsExecutedForAllEntries(): void
         ]);
 
         $callable = new CallableObject(['bar', 'foo'], ['baz', 'bar'], ['ooq', 'qoo']);
-        $map->forAll(static fn ($value, $key) => $callable($value, $key))->execute();
+        $map->forAll(fn ($value, $key) => $callable($value, $key))->execute();
     }
 
     public function testWillGenerateErrorCollectionWhileExecutingForAll(): void
@@ -979,7 +979,7 @@ public function testForAllPromiseWillSuppressErrors(): void
     {
         $map = new GenericMap(['foo' => 'bar']);
 
-        $callback = static function (): void {
+        $callback = function (): void {
             throw new RuntimeException();
         };
         $map->forAll($callback)->suppressErrors();
@@ -991,15 +991,15 @@ public function testForAllPromiseWillSuppressErrors(): void
     public function testForAllPromiseWillExecuteFinallyMethodBeforeThrowingException(): void
     {
         $callbackInvoked = false;
-        $callback        = static function () use (&$callbackInvoked): void {
+        $callback        = function () use (&$callbackInvoked): void {
             $callbackInvoked = true;
         };
 
         $map = new GenericMap(['foo' => 'bar']);
 
         $runtimeExceptionCaught = false;
         try {
-            $map->forAll(static function (): void {
+            $map->forAll(function (): void {
                 throw new RuntimeException();
             })->finally($callback);
         } catch (RuntimeException $exception) {
@@ -1036,7 +1036,7 @@ public function testWillSortKeysByProvidedCustomSorter(): void
 
         $map = new GenericMap($data);
 
-        $sorter = static function (string $a, string $b): int {
+        $sorter = function (string $a, string $b): int {
             return ord($b) <=> ord($a);
         };
 
@@ -1114,7 +1114,7 @@ public function testWillDetectDuplicatedKeys(): void
         $map = new GenericMap(['foo' => 'bar', 'bar' => 'baz']);
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Provided key generator generates the same key "foo" multiple times.');
-        $map->keyExchange(static function (): string {
+        $map->keyExchange(function (): string {
             return 'foo';
         });
     }
@@ -1131,19 +1131,19 @@ public function testWillReduceMap(): void
 
         self::assertSame(
             15,
-            $list->reduce(static fn (int $carry, int $value) => $value + $carry, 0),
+            $list->reduce(fn (int $carry, int $value) => $value + $carry, 0),
             'A sum of all values were expected.',
         );
         self::assertSame(
             120,
-            $list->reduce(static fn (int $carry, int $value) => $carry === 0 ? $value : $value * $carry, 0),
+            $list->reduce(fn (int $carry, int $value) => $carry === 0 ? $value : $value * $carry, 0),
             'Expected that all values are being multiplied with each other',
         );
     }
 
     public function testReduceWillReturnInitialValueOnEmptyList(): void
     {
         $list = new GenericMap([]);
-        self::assertSame(PHP_INT_MAX, $list->reduce(static fn () => 1, PHP_INT_MAX));
+        self::assertSame(PHP_INT_MAX, $list->reduce(fn () => 1, PHP_INT_MAX));
     }
 }
diff --git a/tests/GenericOrderedListTest.php b/tests/GenericOrderedListTest.php

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function count(): int`
`84`	`84`	`*/`
`85`	`85`	`protected function valueComparator(): callable`
`86`	`86`	`{`
`87`		`- return static function ($a, $b): int {`
	`87`	`+ return function ($a, $b): int {`
`88`	`88`	`if (! is_object($a) \|\| ! is_object($b)) {`
`89`	`89`	`return $a <=> $b;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function diffKeys(MapInterface $other, ?callable $keyComparator = null):`
`112`	`112`	`*/`
`113`	`113`	`private function keyComparator(): callable`
`114`	`114`	`{`
`115`		`- return static function (string $a, string $b): int {`
	`115`	`+ return function (string $a, string $b): int {`
`116`	`116`	`return strcmp($a, $b);`
`117`	`117`	`};`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public function toMap(callable $keyGenerator): MapInterface`
`188`	`188`	`public function removeElement($element): OrderedListInterface`
`189`	`189`	`{`
`190`	`190`	`return $this->filter(`
`191`		`- static function ($value) use ($element): bool {`
	`191`	`+ function ($value) use ($element): bool {`
`192`	`192`	`return $value !== $element;`
`193`	`193`	`},`
`194`	`194`	`);`
`@@ -224,7 +224,7 @@ public function unify(`
`224`	`224`	`* @psalm-var callable(mixed):non-empty-string $unificationIdentifierGenerator`
`225`	`225`	`*/`
`226`	`226`	`$unificationIdentifierGenerator = $unificationIdentifierGenerator`
`227`		`- ?? static fn ($value): string => hash('sha256', serialize($value));`
	`227`	`+ ?? fn ($value): string => hash('sha256', serialize($value));`
`228`	`228`
`229`	`229`	`$instance = clone $this;`
`230`	`230`
`@@ -300,7 +300,7 @@ private function createListFilledWithValues(int $start, int $amount, $value): ar`
`300`	`300`	`* @psalm-suppress MissingClosureReturnType We have to assume that the value contains the fill value.`
`301`	`301`	`* @return TValue`
`302`	`302`	`*/`
`303`		`- $callable = static fn () => $value;`
	`303`	`+ $callable = fn () => $value;`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`for ($index = $start; $index < $amount; $index++) {`
`@@ -469,6 +469,6 @@ public function prepend($value): OrderedListInterface`
`469`	`469`
`470`	`470`	`public function removeAt(int $index): OrderedListInterface`
`471`	`471`	`{`
`472`		`- return $this->filter(static fn ($_, int $i) => $i !== $index);`
	`472`	`+ return $this->filter(fn ($_, int $i) => $i !== $index);`
`473`	`473`	`}`
`474`	`474`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ final class ForAllPromiseTest extends TestCase`
`12`	`12`	`public function testWillNotExecuteTwiceDueToDestructionOfObject(): void`
`13`	`13`	`{`
`14`	`14`	`$executed = false;`
`15`		`- $task = static function () use (&$executed): void {`
	`15`	`+ $task = function () use (&$executed): void {`
`16`	`16`	`self::assertFalse($executed, 'Task was executed more than once!');`
`17`	`17`	`$executed = true;`
`18`	`18`	`};`