Skip to content

Commit a0f4b0e

Browse files
authored
Merge pull request #35 from moufmouf/exceptions_to_warning
Switching from exceptions to warnings if an unexpected key is found in parser
2 parents 71df0ed + aaa0971 commit a0f4b0e

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

src/SQLParser/Node/NodeFactory.php

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
2-
32
namespace SQLParser\Node;
43

54
use Mouf\Database\MagicQueryException;
@@ -61,7 +60,7 @@ public static function toObject(array $desc)
6160
unset($desc['delim']);
6261

6362
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));
6564
}
6665

6766
return $const;
@@ -73,11 +72,11 @@ public static function toObject(array $desc)
7372
unset($desc['base_expr']);
7473
unset($desc['expr_type']);
7574
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));
7776
}
7877
unset($desc['sub_tree']);
7978
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));
8180
}
8281

8382
return $operator;
@@ -122,14 +121,14 @@ public static function toObject(array $desc)
122121
unset($desc['base_expr']);
123122
unset($desc['expr_type']);
124123
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));
126125
}
127126
unset($desc['sub_tree']);
128127
unset($desc['alias']);
129128
unset($desc['no_quotes']);
130129
unset($desc['delim']);
131130
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));
133132
}
134133

135134
return $instance;
@@ -195,7 +194,7 @@ public static function toObject(array $desc)
195194
unset($desc['base_expr']);
196195
unset($desc['expr_type']);
197196
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));
199198
}
200199
unset($desc['sub_tree']);
201200
unset($desc['join_type']);
@@ -206,7 +205,7 @@ public static function toObject(array $desc)
206205
unset($desc['hints']);
207206
unset($desc['no_quotes']);
208207
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));
210209
}
211210

212211
return $expr;
@@ -239,8 +238,9 @@ public static function toObject(array $desc)
239238
unset($desc['sub_tree']);
240239
unset($desc['ref_type']);
241240
unset($desc['ref_clause']);
241+
unset($desc['hints']);
242242
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));
244244
}
245245

246246
return $expr;
@@ -261,7 +261,7 @@ public static function toObject(array $desc)
261261
unset($desc['alias']);
262262
unset($desc['delim']);
263263
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));
265265
}
266266

267267
return $expr;
@@ -288,7 +288,7 @@ public static function toObject(array $desc)
288288
unset($desc['direction']);
289289
unset($desc['delim']);
290290
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));
292292
}
293293

294294
return $expr;
@@ -300,12 +300,12 @@ public static function toObject(array $desc)
300300
unset($desc['base_expr']);
301301
unset($desc['expr_type']);
302302
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));
304304
}
305305
unset($desc['sub_tree']);
306306
unset($desc['delim']);
307307
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));
309309
}
310310

311311
return $operator;
@@ -325,7 +325,7 @@ public static function toObject(array $desc)
325325
unset($desc['direction']);
326326
unset($desc['delim']);
327327
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));
329329
}
330330

331331
return $res;
@@ -379,7 +379,7 @@ public static function toObject(array $desc)
379379
unset($desc['direction']);
380380
unset($desc['delim']);
381381
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));
383383
}
384384

385385
return $expr;
@@ -726,7 +726,7 @@ public static function simplify($nodes)
726726
*
727727
* @param Operator $node
728728
*
729-
* @throws \Exception
729+
* @throws MagicQueryException
730730
*
731731
* @return unknown
732732
*/
@@ -741,7 +741,7 @@ private static function getOperatorPrecedence(Operator $node)
741741
}
742742
}
743743
}
744-
throw new \Exception('Unknown operator precedence for operator '.$value);
744+
throw new MagicQueryException('Unknown operator precedence for operator '.$value);
745745
}
746746

747747
/**
@@ -752,8 +752,6 @@ private static function getOperatorPrecedence(Operator $node)
752752
*/
753753
public static function nodeToInstanceDescriptor($node, MoufManager $moufManager)
754754
{
755-
$instanceDescriptor = $moufManager->createInstance(get_called_class());
756-
757755
return self::array_map_deep($node, function ($item) use ($moufManager) {
758756
if ($item instanceof NodeInterface) {
759757
return $item->toInstanceDescriptor($moufManager);

0 commit comments

Comments
 (0)