From c1739d090e44b82b41b8e32f429fa68ddc28072a Mon Sep 17 00:00:00 2001 From: Martin Herndl Date: Sat, 30 Mar 2024 14:01:42 +0100 Subject: [PATCH] Revert non-empty-array specification for Assert::uniqueValues --- .../AssertTypeSpecifyingExtension.php | 25 ------------------- tests/Type/WebMozartAssert/data/type.php | 6 ----- 2 files changed, 31 deletions(-) diff --git a/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php b/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php index 4d29712..d86aa1c 100644 --- a/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php +++ b/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php @@ -752,9 +752,6 @@ private function getExpressionResolvers(): array ) ); }, - 'uniqueValues' => static function (Scope $scope, Arg $value): array { - return self::createIsNonEmptyArrayAndSomethingExprPair('uniqueValues', [$value]); - }, ]; foreach (['contains', 'startsWith', 'endsWith'] as $name) { @@ -1005,28 +1002,6 @@ private static function createIsNonEmptyStringAndSomethingExprPair(string $name, return [$expr, $rootExpr]; } - /** - * @param Arg[] $args - * @return array{Expr, Expr} - */ - private static function createIsNonEmptyArrayAndSomethingExprPair(string $name, array $args): array - { - $expr = new GreaterOrEqual( - new FuncCall( - new Name('count'), - [$args[0]] - ), - new LNumber(1) - ); - - $rootExpr = new BooleanAnd( - $expr, - new FuncCall(new Name('FAUX_FUNCTION_ ' . $name), $args) - ); - - return [$expr, $rootExpr]; - } - private function specifyRootExprIfSet(?Expr $rootExpr, SpecifiedTypes $specifiedTypes): SpecifiedTypes { if ($rootExpr === null) { diff --git a/tests/Type/WebMozartAssert/data/type.php b/tests/Type/WebMozartAssert/data/type.php index b075a8f..f920254 100644 --- a/tests/Type/WebMozartAssert/data/type.php +++ b/tests/Type/WebMozartAssert/data/type.php @@ -305,12 +305,6 @@ public function isArrayAccessible($a, $b): void Assert::nullOrIsArrayAccessible($b); assertType('array|ArrayAccess|null', $b); } - - public function uniqueValues(array $a): void - { - Assert::uniqueValues($a); - assertType('non-empty-array', $a); - } } class Foo {}