@@ -710,45 +710,45 @@ public static function dataFindStartInsideClosedScopeNestedWithinMatch()
710
710
// These were already working correctly.
711
711
'Closure function keyword should be start of closure - closure keyword ' => [
712
712
'testMarker ' => '/* test437ClosureDeclaration */ ' ,
713
- 'targets ' => T_CLOSURE ,
713
+ 'target ' => T_CLOSURE ,
714
714
'expectedTarget ' => T_CLOSURE ,
715
715
],
716
716
'Open curly is a statement/expression opener - open curly ' => [
717
717
'testMarker ' => '/* test437ClosureDeclaration */ ' ,
718
- 'targets ' => T_OPEN_CURLY_BRACKET ,
718
+ 'target ' => T_OPEN_CURLY_BRACKET ,
719
719
'expectedTarget ' => T_OPEN_CURLY_BRACKET ,
720
720
],
721
721
722
722
'Echo should be start for expression - echo keyword ' => [
723
723
'testMarker ' => '/* test437EchoNestedWithinClosureWithinMatch */ ' ,
724
- 'targets ' => T_ECHO ,
724
+ 'target ' => T_ECHO ,
725
725
'expectedTarget ' => T_ECHO ,
726
726
],
727
727
'Echo should be start for expression - variable ' => [
728
728
'testMarker ' => '/* test437EchoNestedWithinClosureWithinMatch */ ' ,
729
- 'targets ' => T_VARIABLE ,
729
+ 'target ' => T_VARIABLE ,
730
730
'expectedTarget ' => T_ECHO ,
731
731
],
732
732
'Echo should be start for expression - comma ' => [
733
733
'testMarker ' => '/* test437EchoNestedWithinClosureWithinMatch */ ' ,
734
- 'targets ' => T_COMMA ,
734
+ 'target ' => T_COMMA ,
735
735
'expectedTarget ' => T_ECHO ,
736
736
],
737
737
738
738
// These were not working correctly and would previously return the close curly of the match expression.
739
739
'First token after comma in echo expression should be start for expression - text string ' => [
740
740
'testMarker ' => '/* test437EchoNestedWithinClosureWithinMatch */ ' ,
741
- 'targets ' => T_CONSTANT_ENCAPSED_STRING ,
741
+ 'target ' => T_CONSTANT_ENCAPSED_STRING ,
742
742
'expectedTarget ' => T_CONSTANT_ENCAPSED_STRING ,
743
743
],
744
744
'First token after comma in echo expression - PHP_EOL constant ' => [
745
745
'testMarker ' => '/* test437EchoNestedWithinClosureWithinMatch */ ' ,
746
- 'targets ' => T_STRING ,
746
+ 'target ' => T_STRING ,
747
747
'expectedTarget ' => T_STRING ,
748
748
],
749
749
'First token after comma in echo expression - semicolon ' => [
750
750
'testMarker ' => '/* test437EchoNestedWithinClosureWithinMatch */ ' ,
751
- 'targets ' => T_SEMICOLON ,
751
+ 'target ' => T_SEMICOLON ,
752
752
'expectedTarget ' => T_STRING ,
753
753
],
754
754
];
@@ -791,44 +791,44 @@ public static function dataFindStartInsideParenthesesNestedWithinMatch()
791
791
return [
792
792
'Array item itself should be start for first array item ' => [
793
793
'testMarker ' => '/* test437NestedLongArrayWithinMatch */ ' ,
794
- 'targets ' => T_LNUMBER ,
794
+ 'target ' => T_LNUMBER ,
795
795
'expectedTarget ' => T_LNUMBER ,
796
796
],
797
797
'Array item itself should be start for second array item ' => [
798
798
'testMarker ' => '/* test437NestedLongArrayWithinMatch */ ' ,
799
- 'targets ' => T_DNUMBER ,
799
+ 'target ' => T_DNUMBER ,
800
800
'expectedTarget ' => T_DNUMBER ,
801
801
],
802
802
'Array item itself should be start for third array item ' => [
803
803
'testMarker ' => '/* test437NestedLongArrayWithinMatch */ ' ,
804
- 'targets ' => T_VARIABLE ,
804
+ 'target ' => T_VARIABLE ,
805
805
'expectedTarget ' => T_VARIABLE ,
806
806
],
807
807
808
808
'Parameter itself should be start for first param passed to function call ' => [
809
809
'testMarker ' => '/* test437NestedFunctionCallWithinMatch */ ' ,
810
- 'targets ' => T_LNUMBER ,
810
+ 'target ' => T_LNUMBER ,
811
811
'expectedTarget ' => T_LNUMBER ,
812
812
],
813
813
'Parameter itself should be start for second param passed to function call ' => [
814
814
'testMarker ' => '/* test437NestedFunctionCallWithinMatch */ ' ,
815
- 'targets ' => T_VARIABLE ,
815
+ 'target ' => T_VARIABLE ,
816
816
'expectedTarget ' => T_VARIABLE ,
817
817
],
818
818
'Parameter itself should be start for third param passed to function call ' => [
819
819
'testMarker ' => '/* test437NestedFunctionCallWithinMatch */ ' ,
820
- 'targets ' => T_DNUMBER ,
820
+ 'target ' => T_DNUMBER ,
821
821
'expectedTarget ' => T_DNUMBER ,
822
822
],
823
823
824
824
'Parameter itself should be start for first param declared in arrow function ' => [
825
825
'testMarker ' => '/* test437NestedArrowFunctionWithinMatch */ ' ,
826
- 'targets ' => T_VARIABLE ,
826
+ 'target ' => T_VARIABLE ,
827
827
'expectedTarget ' => T_VARIABLE ,
828
828
],
829
829
'Parameter itself should be start for second param declared in arrow function ' => [
830
830
'testMarker ' => '/* test437FnSecondParamWithinMatch */ ' ,
831
- 'targets ' => T_VARIABLE ,
831
+ 'target ' => T_VARIABLE ,
832
832
'expectedTarget ' => T_VARIABLE ,
833
833
],
834
834
];
@@ -872,44 +872,44 @@ public static function dataFindStartInsideParenthesesNestedWithinNestedMatch()
872
872
return [
873
873
'Array item itself should be start for first array item ' => [
874
874
'testMarker ' => '/* test437NestedLongArrayWithinNestedMatch */ ' ,
875
- 'targets ' => T_LNUMBER ,
875
+ 'target ' => T_LNUMBER ,
876
876
'expectedTarget ' => T_LNUMBER ,
877
877
],
878
878
'Array item itself should be start for second array item ' => [
879
879
'testMarker ' => '/* test437NestedLongArrayWithinNestedMatch */ ' ,
880
- 'targets ' => T_DNUMBER ,
880
+ 'target ' => T_DNUMBER ,
881
881
'expectedTarget ' => T_DNUMBER ,
882
882
],
883
883
'Array item itself should be start for third array item ' => [
884
884
'testMarker ' => '/* test437NestedLongArrayWithinNestedMatch */ ' ,
885
- 'targets ' => T_VARIABLE ,
885
+ 'target ' => T_VARIABLE ,
886
886
'expectedTarget ' => T_VARIABLE ,
887
887
],
888
888
889
889
'Parameter itself should be start for first param passed to function call ' => [
890
890
'testMarker ' => '/* test437NestedFunctionCallWithinNestedMatch */ ' ,
891
- 'targets ' => T_LNUMBER ,
891
+ 'target ' => T_LNUMBER ,
892
892
'expectedTarget ' => T_LNUMBER ,
893
893
],
894
894
'Parameter itself should be start for second param passed to function call ' => [
895
895
'testMarker ' => '/* test437NestedFunctionCallWithinNestedMatch */ ' ,
896
- 'targets ' => T_VARIABLE ,
896
+ 'target ' => T_VARIABLE ,
897
897
'expectedTarget ' => T_VARIABLE ,
898
898
],
899
899
'Parameter itself should be start for third param passed to function call ' => [
900
900
'testMarker ' => '/* test437NestedFunctionCallWithinNestedMatch */ ' ,
901
- 'targets ' => T_DNUMBER ,
901
+ 'target ' => T_DNUMBER ,
902
902
'expectedTarget ' => T_DNUMBER ,
903
903
],
904
904
905
905
'Parameter itself should be start for first param declared in arrow function ' => [
906
906
'testMarker ' => '/* test437NestedArrowFunctionWithinNestedMatch */ ' ,
907
- 'targets ' => T_VARIABLE ,
907
+ 'target ' => T_VARIABLE ,
908
908
'expectedTarget ' => T_VARIABLE ,
909
909
],
910
910
'Parameter itself should be start for second param declared in arrow function ' => [
911
911
'testMarker ' => '/* test437FnSecondParamWithinNestedMatch */ ' ,
912
- 'targets ' => T_VARIABLE ,
912
+ 'target ' => T_VARIABLE ,
913
913
'expectedTarget ' => T_VARIABLE ,
914
914
],
915
915
];
@@ -952,17 +952,17 @@ public static function dataFindStartInsideShortArrayNestedWithinMatch()
952
952
return [
953
953
'Array item itself should be start for first array item ' => [
954
954
'testMarker ' => '/* test437NestedShortArrayWithinMatch */ ' ,
955
- 'targets ' => T_LNUMBER ,
955
+ 'target ' => T_LNUMBER ,
956
956
'expectedTarget ' => T_LNUMBER ,
957
957
],
958
958
'Array item itself should be start for second array item ' => [
959
959
'testMarker ' => '/* test437NestedShortArrayWithinMatch */ ' ,
960
- 'targets ' => T_DNUMBER ,
960
+ 'target ' => T_DNUMBER ,
961
961
'expectedTarget ' => T_DNUMBER ,
962
962
],
963
963
'Array item itself should be start for third array item ' => [
964
964
'testMarker ' => '/* test437NestedShortArrayWithinMatch */ ' ,
965
- 'targets ' => T_VARIABLE ,
965
+ 'target ' => T_VARIABLE ,
966
966
'expectedTarget ' => T_VARIABLE ,
967
967
],
968
968
];
0 commit comments