From da1a46c89241ad1210e68c170f8cd85e43498314 Mon Sep 17 00:00:00 2001 From: Simon Podlipsky Date: Fri, 9 Feb 2024 13:43:56 +0100 Subject: [PATCH] style: fix cs vol.2 --- phpcs.xml.dist | 2 ++ src/Functional/ButLast.php | 1 + src/Functional/Curry.php | 1 + src/Functional/CurryN.php | 1 + src/Functional/Exceptions/InvalidArgumentException.php | 1 + src/Functional/Exceptions/MatchException.php | 1 + src/Functional/FirstIndexOf.php | 1 + src/Functional/FlatMap.php | 1 + src/Functional/Flatten.php | 1 + src/Functional/Flip.php | 1 + src/Functional/Functional.php | 1 - src/Functional/GreaterThan.php | 1 + src/Functional/GreaterThanOrEqual.php | 1 + src/Functional/Group.php | 1 + src/Functional/IndexesOf.php | 1 + src/Functional/Invoke.php | 1 + src/Functional/InvokeFirst.php | 1 + src/Functional/InvokeIf.php | 1 + src/Functional/InvokeLast.php | 1 + src/Functional/LastIndexOf.php | 1 + src/Functional/LessThan.php | 1 + src/Functional/LessThanOrEqual.php | 1 + src/Functional/LexicographicCompare.php | 1 + src/Functional/Memoize.php | 1 + src/Functional/PartialAny.php | 1 + src/Functional/PartialMethod.php | 1 + src/Functional/Partition.php | 1 + src/Functional/Pick.php | 1 + src/Functional/Pluck.php | 1 + src/Functional/TakeLeft.php | 1 + src/Functional/TakeRight.php | 1 + src/Functional/Unique.php | 1 + src/Functional/ValueToKey.php | 1 + src/Functional/With.php | 1 + src/Functional/Zip.php | 1 + src/Functional/ZipAll.php | 1 + tests/Functional/AbstractTestCase.php | 1 + tests/Functional/GroupTest.php | 2 ++ tests/Functional/InvokeFirstTest.php | 2 ++ tests/Functional/InvokeIfTest.php | 2 ++ tests/Functional/InvokeLastTest.php | 2 ++ tests/Functional/InvokeTest.php | 2 ++ tests/Functional/OmitKeysTest.php | 1 + tests/Functional/PartialAnyTest.php | 1 + tests/Functional/PartialMethodTest.php | 1 - tests/Functional/PluckTest.php | 1 + tests/Functional/SelectKeysTest.php | 1 + tests/Functional/TapTest.php | 1 + tests/Functional/WithTest.php | 1 + tests/Functional/ZipAllTest.php | 1 + 50 files changed, 54 insertions(+), 2 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index c8fb9e17..f2e08457 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -10,6 +10,8 @@ + + diff --git a/src/Functional/ButLast.php b/src/Functional/ButLast.php index 1581dbbe..8d7c0655 100644 --- a/src/Functional/ButLast.php +++ b/src/Functional/ButLast.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_array; /** diff --git a/src/Functional/Curry.php b/src/Functional/Curry.php index dcc35caf..8f81ea6a 100644 --- a/src/Functional/Curry.php +++ b/src/Functional/Curry.php @@ -13,6 +13,7 @@ use ReflectionMethod; use ReflectionFunction; use Closure; + use function count; use function is_array; use function is_object; diff --git a/src/Functional/CurryN.php b/src/Functional/CurryN.php index 802c877b..73113b2f 100644 --- a/src/Functional/CurryN.php +++ b/src/Functional/CurryN.php @@ -9,6 +9,7 @@ */ namespace Functional; + use function call_user_func_array; use function count; diff --git a/src/Functional/Exceptions/InvalidArgumentException.php b/src/Functional/Exceptions/InvalidArgumentException.php index d87d42e0..be541a06 100644 --- a/src/Functional/Exceptions/InvalidArgumentException.php +++ b/src/Functional/Exceptions/InvalidArgumentException.php @@ -9,6 +9,7 @@ */ namespace Functional\Exceptions; + use function count; use function get_class; use function gettype; diff --git a/src/Functional/Exceptions/MatchException.php b/src/Functional/Exceptions/MatchException.php index 55e941f2..6c75b534 100644 --- a/src/Functional/Exceptions/MatchException.php +++ b/src/Functional/Exceptions/MatchException.php @@ -9,6 +9,7 @@ */ namespace Functional\Exceptions; + use function count; use function gettype; use function is_array; diff --git a/src/Functional/FirstIndexOf.php b/src/Functional/FirstIndexOf.php index b97b987a..ad397b46 100644 --- a/src/Functional/FirstIndexOf.php +++ b/src/Functional/FirstIndexOf.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_callable; /** diff --git a/src/Functional/FlatMap.php b/src/Functional/FlatMap.php index 91752088..8e8b265a 100644 --- a/src/Functional/FlatMap.php +++ b/src/Functional/FlatMap.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_array; /** diff --git a/src/Functional/Flatten.php b/src/Functional/Flatten.php index 085d6445..7fd57472 100644 --- a/src/Functional/Flatten.php +++ b/src/Functional/Flatten.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_array; /** diff --git a/src/Functional/Flip.php b/src/Functional/Flip.php index 631908dd..92dcd026 100644 --- a/src/Functional/Flip.php +++ b/src/Functional/Flip.php @@ -9,6 +9,7 @@ */ namespace Functional; + use function func_get_args; /** diff --git a/src/Functional/Functional.php b/src/Functional/Functional.php index caaed895..59936572 100644 --- a/src/Functional/Functional.php +++ b/src/Functional/Functional.php @@ -12,7 +12,6 @@ final class Functional { - /** * @see \Function\ary */ diff --git a/src/Functional/GreaterThan.php b/src/Functional/GreaterThan.php index ad9f3383..3d682d90 100644 --- a/src/Functional/GreaterThan.php +++ b/src/Functional/GreaterThan.php @@ -9,6 +9,7 @@ */ namespace Functional; + use Closure; /** diff --git a/src/Functional/GreaterThanOrEqual.php b/src/Functional/GreaterThanOrEqual.php index 397f51c7..d17b0654 100644 --- a/src/Functional/GreaterThanOrEqual.php +++ b/src/Functional/GreaterThanOrEqual.php @@ -9,6 +9,7 @@ */ namespace Functional; + use Closure; /** diff --git a/src/Functional/Group.php b/src/Functional/Group.php index ff4d7136..c7ca6202 100644 --- a/src/Functional/Group.php +++ b/src/Functional/Group.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_float; /** diff --git a/src/Functional/IndexesOf.php b/src/Functional/IndexesOf.php index b197f319..afadaf84 100644 --- a/src/Functional/IndexesOf.php +++ b/src/Functional/IndexesOf.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_callable; /** diff --git a/src/Functional/Invoke.php b/src/Functional/Invoke.php index 876542df..4a10d921 100644 --- a/src/Functional/Invoke.php +++ b/src/Functional/Invoke.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_callable; /** diff --git a/src/Functional/InvokeFirst.php b/src/Functional/InvokeFirst.php index 20478b2d..f0d0ef5a 100644 --- a/src/Functional/InvokeFirst.php +++ b/src/Functional/InvokeFirst.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_callable; /** diff --git a/src/Functional/InvokeIf.php b/src/Functional/InvokeIf.php index 34cfacae..8b6ebd03 100644 --- a/src/Functional/InvokeIf.php +++ b/src/Functional/InvokeIf.php @@ -9,6 +9,7 @@ */ namespace Functional; + use function is_callable; /** diff --git a/src/Functional/InvokeLast.php b/src/Functional/InvokeLast.php index 49eda8ac..4b566eb0 100644 --- a/src/Functional/InvokeLast.php +++ b/src/Functional/InvokeLast.php @@ -12,6 +12,7 @@ use Traversable; use Functional\Exceptions\InvalidArgumentException; + use function is_callable; /** diff --git a/src/Functional/LastIndexOf.php b/src/Functional/LastIndexOf.php index a05762f7..561390a6 100644 --- a/src/Functional/LastIndexOf.php +++ b/src/Functional/LastIndexOf.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_callable; /** diff --git a/src/Functional/LessThan.php b/src/Functional/LessThan.php index ff178237..5dbf12e7 100644 --- a/src/Functional/LessThan.php +++ b/src/Functional/LessThan.php @@ -9,6 +9,7 @@ */ namespace Functional; + use Closure; /** diff --git a/src/Functional/LessThanOrEqual.php b/src/Functional/LessThanOrEqual.php index d65e992c..ba8a5918 100644 --- a/src/Functional/LessThanOrEqual.php +++ b/src/Functional/LessThanOrEqual.php @@ -9,6 +9,7 @@ */ namespace Functional; + use Closure; /** diff --git a/src/Functional/LexicographicCompare.php b/src/Functional/LexicographicCompare.php index 2a8bd1aa..c5c529fa 100644 --- a/src/Functional/LexicographicCompare.php +++ b/src/Functional/LexicographicCompare.php @@ -9,6 +9,7 @@ */ namespace Functional; + use Closure; /** diff --git a/src/Functional/Memoize.php b/src/Functional/Memoize.php index e66df8a1..83152c6c 100644 --- a/src/Functional/Memoize.php +++ b/src/Functional/Memoize.php @@ -11,6 +11,7 @@ namespace Functional; use const E_USER_DEPRECATED; + use function array_key_exists; use function is_callable; diff --git a/src/Functional/PartialAny.php b/src/Functional/PartialAny.php index 6a7f14e1..21cba641 100644 --- a/src/Functional/PartialAny.php +++ b/src/Functional/PartialAny.php @@ -11,6 +11,7 @@ namespace Functional; use Functional\Exceptions\InvalidArgumentException; + use function define; /** diff --git a/src/Functional/PartialMethod.php b/src/Functional/PartialMethod.php index b42aea76..f8b46e65 100644 --- a/src/Functional/PartialMethod.php +++ b/src/Functional/PartialMethod.php @@ -11,6 +11,7 @@ namespace Functional; use Functional\Exceptions\InvalidArgumentException; + use function is_callable; /** diff --git a/src/Functional/Partition.php b/src/Functional/Partition.php index 0e05611d..289e558c 100644 --- a/src/Functional/Partition.php +++ b/src/Functional/Partition.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function count; /** diff --git a/src/Functional/Pick.php b/src/Functional/Pick.php index 875dee94..ffbc9188 100644 --- a/src/Functional/Pick.php +++ b/src/Functional/Pick.php @@ -12,6 +12,7 @@ use ArrayAccess; use Functional\Exceptions\InvalidArgumentException; + use function array_key_exists; use function is_array; diff --git a/src/Functional/Pluck.php b/src/Functional/Pluck.php index 31c5962b..ba203bad 100644 --- a/src/Functional/Pluck.php +++ b/src/Functional/Pluck.php @@ -13,6 +13,7 @@ use ArrayAccess; use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_array; use function is_object; diff --git a/src/Functional/TakeLeft.php b/src/Functional/TakeLeft.php index 88910c50..0143eb2e 100644 --- a/src/Functional/TakeLeft.php +++ b/src/Functional/TakeLeft.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function array_slice; use function is_array; diff --git a/src/Functional/TakeRight.php b/src/Functional/TakeRight.php index fc5bd806..0e2a1bc2 100644 --- a/src/Functional/TakeRight.php +++ b/src/Functional/TakeRight.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function array_slice; use function is_array; diff --git a/src/Functional/Unique.php b/src/Functional/Unique.php index 802574cc..f2a67e97 100644 --- a/src/Functional/Unique.php +++ b/src/Functional/Unique.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function in_array; /** diff --git a/src/Functional/ValueToKey.php b/src/Functional/ValueToKey.php index 94371102..4c58eab2 100644 --- a/src/Functional/ValueToKey.php +++ b/src/Functional/ValueToKey.php @@ -13,6 +13,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; use WeakReference; + use function get_class; use function gettype; diff --git a/src/Functional/With.php b/src/Functional/With.php index fadaf34d..2ab40dfe 100644 --- a/src/Functional/With.php +++ b/src/Functional/With.php @@ -11,6 +11,7 @@ namespace Functional; use Functional\Exceptions\InvalidArgumentException; + use function is_callable; /** diff --git a/src/Functional/Zip.php b/src/Functional/Zip.php index ed2a1f46..c5769e8b 100644 --- a/src/Functional/Zip.php +++ b/src/Functional/Zip.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_callable; /** diff --git a/src/Functional/ZipAll.php b/src/Functional/ZipAll.php index 01260e94..526a97be 100644 --- a/src/Functional/ZipAll.php +++ b/src/Functional/ZipAll.php @@ -12,6 +12,7 @@ use Functional\Exceptions\InvalidArgumentException; use Traversable; + use function is_callable; /** diff --git a/tests/Functional/AbstractTestCase.php b/tests/Functional/AbstractTestCase.php index 50e6e2ef..0b33c572 100644 --- a/tests/Functional/AbstractTestCase.php +++ b/tests/Functional/AbstractTestCase.php @@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase; use Traversable; use TypeError; + use function count; use function func_get_args; use function func_num_args; diff --git a/tests/Functional/GroupTest.php b/tests/Functional/GroupTest.php index 1c1b5b89..2a604826 100644 --- a/tests/Functional/GroupTest.php +++ b/tests/Functional/GroupTest.php @@ -14,8 +14,10 @@ use Functional\Exceptions\InvalidArgumentException; use function Functional\group; + use Exception; use stdClass; + use function is_int; class GroupTest extends AbstractTestCase diff --git a/tests/Functional/InvokeFirstTest.php b/tests/Functional/InvokeFirstTest.php index c0f0b354..27aa3957 100644 --- a/tests/Functional/InvokeFirstTest.php +++ b/tests/Functional/InvokeFirstTest.php @@ -14,7 +14,9 @@ use Traversable; use function Functional\invoke_first; + use stdClass; + use function func_get_args; class InvokeFirstTest extends AbstractTestCase diff --git a/tests/Functional/InvokeIfTest.php b/tests/Functional/InvokeIfTest.php index 31fab362..b358ce6a 100644 --- a/tests/Functional/InvokeIfTest.php +++ b/tests/Functional/InvokeIfTest.php @@ -11,7 +11,9 @@ namespace Functional\Tests; use function Functional\invoke_if; + use stdClass; + use function func_get_args; class InvokeIfTest extends AbstractTestCase diff --git a/tests/Functional/InvokeLastTest.php b/tests/Functional/InvokeLastTest.php index a84132f7..872a9c8d 100644 --- a/tests/Functional/InvokeLastTest.php +++ b/tests/Functional/InvokeLastTest.php @@ -13,7 +13,9 @@ use ArrayIterator; use function Functional\invoke_last; + use stdClass; + use function func_get_args; class InvokeLastTest extends AbstractTestCase diff --git a/tests/Functional/InvokeTest.php b/tests/Functional/InvokeTest.php index 6e646d50..2d9be826 100644 --- a/tests/Functional/InvokeTest.php +++ b/tests/Functional/InvokeTest.php @@ -14,7 +14,9 @@ use Traversable; use function Functional\invoke; + use stdClass; + use function func_get_args; class InvokeTest extends AbstractTestCase diff --git a/tests/Functional/OmitKeysTest.php b/tests/Functional/OmitKeysTest.php index b8ea5eef..df97f08d 100644 --- a/tests/Functional/OmitKeysTest.php +++ b/tests/Functional/OmitKeysTest.php @@ -13,6 +13,7 @@ use ArrayIterator; use function Functional\omit_keys; + use stdclass; class OmitKeysTest extends AbstractTestCase diff --git a/tests/Functional/PartialAnyTest.php b/tests/Functional/PartialAnyTest.php index e2a6ffa3..dca62178 100644 --- a/tests/Functional/PartialAnyTest.php +++ b/tests/Functional/PartialAnyTest.php @@ -17,6 +17,7 @@ use function Functional\…; use const Functional\…; + use function defined; class PartialAnyTest extends AbstractPartialTestCase diff --git a/tests/Functional/PartialMethodTest.php b/tests/Functional/PartialMethodTest.php index 2417ed90..e52946b1 100644 --- a/tests/Functional/PartialMethodTest.php +++ b/tests/Functional/PartialMethodTest.php @@ -14,7 +14,6 @@ class PartialMethodTest extends AbstractPartialTestCase { - public function testWithNoArgs(): void { $method = partial_method('execute'); diff --git a/tests/Functional/PluckTest.php b/tests/Functional/PluckTest.php index 5e9b0ccc..fde17a26 100644 --- a/tests/Functional/PluckTest.php +++ b/tests/Functional/PluckTest.php @@ -16,6 +16,7 @@ use Traversable; use function Functional\pluck; + use DomainException; use Exception; use stdClass; diff --git a/tests/Functional/SelectKeysTest.php b/tests/Functional/SelectKeysTest.php index ae1ac4b1..6d5b7eb3 100644 --- a/tests/Functional/SelectKeysTest.php +++ b/tests/Functional/SelectKeysTest.php @@ -13,6 +13,7 @@ use ArrayIterator; use function Functional\select_keys; + use stdclass; class SelectKeysTest extends AbstractTestCase diff --git a/tests/Functional/TapTest.php b/tests/Functional/TapTest.php index c05bc639..08f33a83 100644 --- a/tests/Functional/TapTest.php +++ b/tests/Functional/TapTest.php @@ -11,6 +11,7 @@ namespace Functional\Tests; use function Functional\tap; + use stdClass; class TapTest extends AbstractTestCase diff --git a/tests/Functional/WithTest.php b/tests/Functional/WithTest.php index 6484c950..13dfaacd 100644 --- a/tests/Functional/WithTest.php +++ b/tests/Functional/WithTest.php @@ -11,6 +11,7 @@ namespace Functional\Tests; use function Functional\with; + use Exception; class WithTest extends AbstractTestCase diff --git a/tests/Functional/ZipAllTest.php b/tests/Functional/ZipAllTest.php index cd3f2395..72cc059b 100644 --- a/tests/Functional/ZipAllTest.php +++ b/tests/Functional/ZipAllTest.php @@ -13,6 +13,7 @@ use BadFunctionCallException; use function Functional\zip_all; + use ArrayIterator; class ZipAllTest extends AbstractTestCase