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()
4848 protected function createTermToken ($ position , array $ data )
4949 {
5050 $ lexeme = $ data ['lexeme ' ];
51+ $ token = null ;
5152
5253 switch (true ) {
5354 case isset ($ data ['rangeFrom ' ]) && isset ($ data ['rangeTo ' ]):
54- return new Range (
55+ $ token = new Range (
5556 $ lexeme ,
5657 $ position ,
5758 $ data ['domain ' ],
5859 $ data ['rangeFrom ' ], $ data ['rangeTo ' ]
5960 );
61+ break ;
62+
6063 case isset ($ data ['word ' ]):
61- return new Word (
64+ $ token = new Word (
6265 $ lexeme ,
6366 $ position ,
6467 $ data ['domain ' ],
6568 // un-backslash special characters
6669 preg_replace ('/(?: \\\\( \\\\|(["+\-!():#@ ])))/ ' , '$1 ' , $ data ['word ' ])
6770 );
71+ break ;
72+
6873 case isset ($ data ['phrase ' ]):
6974 $ quote = $ data ['quote ' ];
7075
71- return new Phrase (
76+ $ token = new Phrase (
7277 $ lexeme ,
7378 $ position ,
7479 $ data ['domain ' ],
7580 $ quote ,
7681 // un-backslash quote
7782 preg_replace ('/(?: \\\\([ ' . $ quote . ']))/ ' , '$1 ' , $ data ['phrase ' ])
7883 );
84+ break ;
85+
7986 case isset ($ data ['tag ' ]):
80- return new Tag (
87+ $ token = new Tag (
8188 $ lexeme ,
8289 $ position ,
8390 $ data ['marker ' ],
8491 $ data ['tag ' ]
8592 );
93+ break ;
94+
8695 case isset ($ data ['user ' ]):
87- return new User (
96+ $ token = new User (
8897 $ lexeme ,
8998 $ position ,
9099 $ data ['marker ' ],
91100 $ data ['user ' ]
92101 );
93102 }
94103
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 ;
96109 }
97110}
You can’t perform that action at this time.
0 commit comments