1
1
<?php
2
-
3
2
namespace SQLParser \Node ;
4
3
5
4
use Mouf \Database \MagicQueryException ;
@@ -61,7 +60,7 @@ public static function toObject(array $desc)
61
60
unset($ desc ['delim ' ]);
62
61
63
62
if (!empty ($ desc )) {
64
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
63
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
65
64
}
66
65
67
66
return $ const ;
@@ -73,11 +72,11 @@ public static function toObject(array $desc)
73
72
unset($ desc ['base_expr ' ]);
74
73
unset($ desc ['expr_type ' ]);
75
74
if (!empty ($ desc ['sub_tree ' ])) {
76
- throw new \ InvalidArgumentException ( ' Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
75
+ error_log ( ' MagicQuery - NodeFactory: Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
77
76
}
78
77
unset($ desc ['sub_tree ' ]);
79
78
if (!empty ($ desc )) {
80
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
79
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
81
80
}
82
81
83
82
return $ operator ;
@@ -122,14 +121,14 @@ public static function toObject(array $desc)
122
121
unset($ desc ['base_expr ' ]);
123
122
unset($ desc ['expr_type ' ]);
124
123
if (!empty ($ desc ['sub_tree ' ])) {
125
- throw new \ InvalidArgumentException ( ' Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
124
+ error_log ( ' MagicQuery - NodeFactory: Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
126
125
}
127
126
unset($ desc ['sub_tree ' ]);
128
127
unset($ desc ['alias ' ]);
129
128
unset($ desc ['no_quotes ' ]);
130
129
unset($ desc ['delim ' ]);
131
130
if (!empty ($ desc )) {
132
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
131
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
133
132
}
134
133
135
134
return $ instance ;
@@ -195,7 +194,7 @@ public static function toObject(array $desc)
195
194
unset($ desc ['base_expr ' ]);
196
195
unset($ desc ['expr_type ' ]);
197
196
if (!empty ($ desc ['sub_tree ' ])) {
198
- throw new \ InvalidArgumentException ( ' Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
197
+ error_log ( ' MagicQuery - NodeFactory: Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
199
198
}
200
199
unset($ desc ['sub_tree ' ]);
201
200
unset($ desc ['join_type ' ]);
@@ -206,7 +205,7 @@ public static function toObject(array $desc)
206
205
unset($ desc ['hints ' ]);
207
206
unset($ desc ['no_quotes ' ]);
208
207
if (!empty ($ desc )) {
209
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
208
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
210
209
}
211
210
212
211
return $ expr ;
@@ -239,8 +238,9 @@ public static function toObject(array $desc)
239
238
unset($ desc ['sub_tree ' ]);
240
239
unset($ desc ['ref_type ' ]);
241
240
unset($ desc ['ref_clause ' ]);
241
+ unset($ desc ['hints ' ]);
242
242
if (!empty ($ desc )) {
243
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
243
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
244
244
}
245
245
246
246
return $ expr ;
@@ -261,7 +261,7 @@ public static function toObject(array $desc)
261
261
unset($ desc ['alias ' ]);
262
262
unset($ desc ['delim ' ]);
263
263
if (!empty ($ desc )) {
264
- throw new \ InvalidArgumentException ( ' Unexpected parameters in aggregate function: ' .var_export ($ desc , true ));
264
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in aggregate function: ' .var_export ($ desc , true ));
265
265
}
266
266
267
267
return $ expr ;
@@ -288,7 +288,7 @@ public static function toObject(array $desc)
288
288
unset($ desc ['direction ' ]);
289
289
unset($ desc ['delim ' ]);
290
290
if (!empty ($ desc )) {
291
- throw new \ InvalidArgumentException ( ' Unexpected parameters in simple function: ' .var_export ($ desc , true ));
291
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in simple function: ' .var_export ($ desc , true ));
292
292
}
293
293
294
294
return $ expr ;
@@ -300,12 +300,12 @@ public static function toObject(array $desc)
300
300
unset($ desc ['base_expr ' ]);
301
301
unset($ desc ['expr_type ' ]);
302
302
if (!empty ($ desc ['sub_tree ' ])) {
303
- throw new \ InvalidArgumentException ( ' Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
303
+ error_log ( ' MagicQuery - NodeFactory: Unexpected operator with subtree: ' .var_export ($ desc ['sub_tree ' ], true ));
304
304
}
305
305
unset($ desc ['sub_tree ' ]);
306
306
unset($ desc ['delim ' ]);
307
307
if (!empty ($ desc )) {
308
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
308
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
309
309
}
310
310
311
311
return $ operator ;
@@ -325,7 +325,7 @@ public static function toObject(array $desc)
325
325
unset($ desc ['direction ' ]);
326
326
unset($ desc ['delim ' ]);
327
327
if (!empty ($ desc )) {
328
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
328
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
329
329
}
330
330
331
331
return $ res ;
@@ -379,7 +379,7 @@ public static function toObject(array $desc)
379
379
unset($ desc ['direction ' ]);
380
380
unset($ desc ['delim ' ]);
381
381
if (!empty ($ desc )) {
382
- throw new \ InvalidArgumentException ( ' Unexpected parameters in exception: ' .var_export ($ desc , true ));
382
+ error_log ( ' MagicQuery - NodeFactory: Unexpected parameters in exception: ' .var_export ($ desc , true ));
383
383
}
384
384
385
385
return $ expr ;
@@ -726,7 +726,7 @@ public static function simplify($nodes)
726
726
*
727
727
* @param Operator $node
728
728
*
729
- * @throws \Exception
729
+ * @throws MagicQueryException
730
730
*
731
731
* @return unknown
732
732
*/
@@ -741,7 +741,7 @@ private static function getOperatorPrecedence(Operator $node)
741
741
}
742
742
}
743
743
}
744
- throw new \ Exception ('Unknown operator precedence for operator ' .$ value );
744
+ throw new MagicQueryException ('Unknown operator precedence for operator ' .$ value );
745
745
}
746
746
747
747
/**
@@ -752,8 +752,6 @@ private static function getOperatorPrecedence(Operator $node)
752
752
*/
753
753
public static function nodeToInstanceDescriptor ($ node , MoufManager $ moufManager )
754
754
{
755
- $ instanceDescriptor = $ moufManager ->createInstance (get_called_class ());
756
-
757
755
return self ::array_map_deep ($ node , function ($ item ) use ($ moufManager ) {
758
756
if ($ item instanceof NodeInterface) {
759
757
return $ item ->toInstanceDescriptor ($ moufManager );
0 commit comments