20
20
class ActionObject
21
21
{
22
22
const __ENV = "_ENV " ;
23
- const DATA_ENABLED_ATTRIBUTES = ["userInput " , "parameterArray " , "expected " , "actual " ];
23
+ const DATA_ENABLED_ATTRIBUTES = ["userInput " , "parameterArray " , "expected " , "actual " , " x " , " y " ];
24
24
const SELECTOR_ENABLED_ATTRIBUTES = [
25
25
'selector ' ,
26
26
'dependentSelector ' ,
@@ -40,7 +40,7 @@ class ActionObject
40
40
const ACTION_ATTRIBUTE_URL = 'url ' ;
41
41
const ACTION_ATTRIBUTE_SELECTOR = 'selector ' ;
42
42
const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/ ' ;
43
- const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w]+\.[\w\[\]]+}}/ ' ;
43
+ const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w]+\.? [\w\[\]]+}}/ ' ;
44
44
const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS = '/{{[\w]+\.[\w]+\(.+\)}}/ ' ;
45
45
46
46
/**
@@ -371,7 +371,7 @@ private function resolveDataInputReferences()
371
371
foreach ($ relevantDataAttributes as $ dataAttribute ) {
372
372
$ varInput = $ this ->actionAttributes [$ dataAttribute ];
373
373
$ replacement = $ this ->findAndReplaceReferences (DataObjectHandler::getInstance (), $ varInput );
374
- if ($ replacement != null ) {
374
+ if ($ replacement !== null ) {
375
375
$ this ->resolvedCustomAttributes [$ dataAttribute ] = $ replacement ;
376
376
}
377
377
}
@@ -482,7 +482,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)
482
482
$ replacement = $ this ->resolveEntityDataObjectReference ($ obj , $ match );
483
483
}
484
484
485
- if ($ replacement == null ) {
485
+ if ($ replacement === null ) {
486
486
if (get_class ($ objectHandler ) != DataObjectHandler::class) {
487
487
return $ this ->findAndReplaceReferences (DataObjectHandler::getInstance (), $ outputString );
488
488
} else {
0 commit comments