2020class ActionObject
2121{
2222 const __ENV = "_ENV " ;
23- const DATA_ENABLED_ATTRIBUTES = ["userInput " , "parameterArray " , "expected " , "actual " ];
23+ const DATA_ENABLED_ATTRIBUTES = ["userInput " , "parameterArray " , "expected " , "actual " , " x " , " y " ];
2424 const SELECTOR_ENABLED_ATTRIBUTES = [
2525 'selector ' ,
2626 'dependentSelector ' ,
@@ -40,7 +40,7 @@ class ActionObject
4040 const ACTION_ATTRIBUTE_URL = 'url ' ;
4141 const ACTION_ATTRIBUTE_SELECTOR = 'selector ' ;
4242 const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/ ' ;
43- const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w]+\.[\w\[\]]+}}/ ' ;
43+ const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w]+\.? [\w\[\]]+}}/ ' ;
4444 const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS = '/{{[\w]+\.[\w]+\(.+\)}}/ ' ;
4545
4646 /**
@@ -371,7 +371,7 @@ private function resolveDataInputReferences()
371371 foreach ($ relevantDataAttributes as $ dataAttribute ) {
372372 $ varInput = $ this ->actionAttributes [$ dataAttribute ];
373373 $ replacement = $ this ->findAndReplaceReferences (DataObjectHandler::getInstance (), $ varInput );
374- if ($ replacement != null ) {
374+ if ($ replacement !== null ) {
375375 $ this ->resolvedCustomAttributes [$ dataAttribute ] = $ replacement ;
376376 }
377377 }
@@ -482,7 +482,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)
482482 $ replacement = $ this ->resolveEntityDataObjectReference ($ obj , $ match );
483483 }
484484
485- if ($ replacement == null ) {
485+ if ($ replacement === null ) {
486486 if (get_class ($ objectHandler ) != DataObjectHandler::class) {
487487 return $ this ->findAndReplaceReferences (DataObjectHandler::getInstance (), $ outputString );
488488 } else {
0 commit comments