File tree Expand file tree Collapse file tree 1 file changed +19
-6
lines changed Expand file tree Collapse file tree 1 file changed +19
-6
lines changed Original file line number Diff line number Diff line change @@ -48,50 +48,63 @@ protected function getExpressionTypeMap()
48
48
protected function createTermToken ($ position , array $ data )
49
49
{
50
50
$ lexeme = $ data ['lexeme ' ];
51
+ $ token = null ;
51
52
52
53
switch (true ) {
53
54
case isset ($ data ['rangeFrom ' ]) && isset ($ data ['rangeTo ' ]):
54
- return new Range (
55
+ $ token = new Range (
55
56
$ lexeme ,
56
57
$ position ,
57
58
$ data ['domain ' ],
58
59
$ data ['rangeFrom ' ], $ data ['rangeTo ' ]
59
60
);
61
+ break ;
62
+
60
63
case isset ($ data ['word ' ]):
61
- return new Word (
64
+ $ token = new Word (
62
65
$ lexeme ,
63
66
$ position ,
64
67
$ data ['domain ' ],
65
68
// un-backslash special characters
66
69
preg_replace ('/(?: \\\\( \\\\|(["+\-!():#@ ])))/ ' , '$1 ' , $ data ['word ' ])
67
70
);
71
+ break ;
72
+
68
73
case isset ($ data ['phrase ' ]):
69
74
$ quote = $ data ['quote ' ];
70
75
71
- return new Phrase (
76
+ $ token = new Phrase (
72
77
$ lexeme ,
73
78
$ position ,
74
79
$ data ['domain ' ],
75
80
$ quote ,
76
81
// un-backslash quote
77
82
preg_replace ('/(?: \\\\([ ' . $ quote . ']))/ ' , '$1 ' , $ data ['phrase ' ])
78
83
);
84
+ break ;
85
+
79
86
case isset ($ data ['tag ' ]):
80
- return new Tag (
87
+ $ token = new Tag (
81
88
$ lexeme ,
82
89
$ position ,
83
90
$ data ['marker ' ],
84
91
$ data ['tag ' ]
85
92
);
93
+ break ;
94
+
86
95
case isset ($ data ['user ' ]):
87
- return new User (
96
+ $ token = new User (
88
97
$ lexeme ,
89
98
$ position ,
90
99
$ data ['marker ' ],
91
100
$ data ['user ' ]
92
101
);
93
102
}
94
103
95
- throw new RuntimeException ('Could not extract term token from the given data ' );
104
+ if (!$ token ) {
105
+ throw new RuntimeException ('Could not extract term token from the given data ' );
106
+ }
107
+
108
+ return $ token ;
96
109
}
97
110
}
You can’t perform that action at this time.
0 commit comments