@@ -739,9 +739,9 @@ private static function getExpressionResolvers(): array
739
739
];
740
740
741
741
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 {
743
743
if ($ scope ->getType ($ subString ->value )->isNonEmptyString ()->yes ()) {
744
- return self ::createIsNonEmptyStringAndSomethingExprPair ([$ value , $ subString ]);
744
+ return self ::createIsNonEmptyStringAndSomethingExprPair ($ name , [$ value , $ subString ]);
745
745
}
746
746
747
747
return [self ::$ resolvers ['string ' ]($ scope , $ value ), null ];
@@ -764,8 +764,8 @@ private static function getExpressionResolvers(): array
764
764
'notWhitespaceOnly ' ,
765
765
];
766
766
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 ]);
769
769
};
770
770
}
771
771
@@ -956,7 +956,7 @@ static function (?ArrayItem $item) use ($scope, $value, $resolver) {
956
956
* @param Arg[] $args
957
957
* @return array{Expr, Expr}
958
958
*/
959
- private static function createIsNonEmptyStringAndSomethingExprPair (array $ args ): array
959
+ private static function createIsNonEmptyStringAndSomethingExprPair (string $ name , array $ args ): array
960
960
{
961
961
$ expr = new BooleanAnd (
962
962
new FuncCall (
@@ -971,7 +971,7 @@ private static function createIsNonEmptyStringAndSomethingExprPair(array $args):
971
971
972
972
$ rootExpr = new BooleanAnd (
973
973
$ expr ,
974
- new FuncCall (new Name ('FAUX_FUNCTION ' ), $ args )
974
+ new FuncCall (new Name ('FAUX_FUNCTION_ ' . $ name ), $ args )
975
975
);
976
976
977
977
return [$ expr , $ rootExpr ];
0 commit comments