Skip to content

Commit c8cd404

Browse files
herndlmondrejmirtes
authored andcommitted
Add original function name to FAUX_FUNCTION to avoid potential clashes
1 parent 463e931 commit c8cd404

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -739,9 +739,9 @@ private static function getExpressionResolvers(): array
739739
];
740740

741741
foreach (['contains', 'startsWith', 'endsWith'] as $name) {
742-
self::$resolvers[$name] = static function (Scope $scope, Arg $value, Arg $subString): array {
742+
self::$resolvers[$name] = static function (Scope $scope, Arg $value, Arg $subString) use ($name): array {
743743
if ($scope->getType($subString->value)->isNonEmptyString()->yes()) {
744-
return self::createIsNonEmptyStringAndSomethingExprPair([$value, $subString]);
744+
return self::createIsNonEmptyStringAndSomethingExprPair($name, [$value, $subString]);
745745
}
746746

747747
return [self::$resolvers['string']($scope, $value), null];
@@ -764,8 +764,8 @@ private static function getExpressionResolvers(): array
764764
'notWhitespaceOnly',
765765
];
766766
foreach ($assertionsResultingAtLeastInNonEmptyString as $name) {
767-
self::$resolvers[$name] = static function (Scope $scope, Arg $value): array {
768-
return self::createIsNonEmptyStringAndSomethingExprPair([$value]);
767+
self::$resolvers[$name] = static function (Scope $scope, Arg $value) use ($name): array {
768+
return self::createIsNonEmptyStringAndSomethingExprPair($name, [$value]);
769769
};
770770
}
771771

@@ -956,7 +956,7 @@ static function (?ArrayItem $item) use ($scope, $value, $resolver) {
956956
* @param Arg[] $args
957957
* @return array{Expr, Expr}
958958
*/
959-
private static function createIsNonEmptyStringAndSomethingExprPair(array $args): array
959+
private static function createIsNonEmptyStringAndSomethingExprPair(string $name, array $args): array
960960
{
961961
$expr = new BooleanAnd(
962962
new FuncCall(
@@ -971,7 +971,7 @@ private static function createIsNonEmptyStringAndSomethingExprPair(array $args):
971971

972972
$rootExpr = new BooleanAnd(
973973
$expr,
974-
new FuncCall(new Name('FAUX_FUNCTION'), $args)
974+
new FuncCall(new Name('FAUX_FUNCTION_ ' . $name), $args)
975975
);
976976

977977
return [$expr, $rootExpr];

0 commit comments

Comments
 (0)