Merge pull request #63 from thecodingmachine/1.3

moufmouf · web-flow · commit dd1a312fbd3d · 2019-12-13T13:56:22.000+01:00
Porting alias fix (PHP 7.4 compatiblity) to 1.4 branch
diff --git a/.travis.yml b/.travis.yml
@@ -42,3 +42,10 @@ jobs:
       - *composerupdate
     script:
       - *phpunit
+  - stage: test
+    php: 7.4
+    env: PREFER_LOWEST=""
+    before_script:
+      - *composerupdate
+    script:
+      - *phpunit
diff --git a/src/SQLParser/Node/NodeFactory.php b/src/SQLParser/Node/NodeFactory.php
@@ -183,7 +183,7 @@ public static function toObject(array $desc)
                 }
                 $expr->setJoinType($joinType);
 
-                if (isset($desc['alias'])) {
+                if (isset($desc['alias']['name'])) {
                     $expr->setAlias($desc['alias']['name']);
                 }
                 $subTreeNodes = self::buildFromSubtree($desc['ref_clause']);
@@ -366,7 +366,7 @@ public static function toObject(array $desc)
                     $expr->setSubTree(self::buildFromSubtree($desc['sub_tree']));
                 }
 
-                if (isset($desc['alias'])) {
+                if (isset($desc['alias']['name'])) {
                     $expr->setAlias($desc['alias']['name']);
                 }
                 if (isset($desc['direction'])) {

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public static function toObject(array $desc)`
`183`	`183`	`}`
`184`	`184`	`$expr->setJoinType($joinType);`
`185`	`185`
`186`		`- if (isset($desc['alias'])) {`
	`186`	`+ if (isset($desc['alias']['name'])) {`
`187`	`187`	`$expr->setAlias($desc['alias']['name']);`
`188`	`188`	`}`
`189`	`189`	`$subTreeNodes = self::buildFromSubtree($desc['ref_clause']);`
`@@ -366,7 +366,7 @@ public static function toObject(array $desc)`
`366`	`366`	`$expr->setSubTree(self::buildFromSubtree($desc['sub_tree']));`
`367`	`367`	`}`
`368`	`368`
`369`		`- if (isset($desc['alias'])) {`
	`369`	`+ if (isset($desc['alias']['name'])) {`
`370`	`370`	`$expr->setAlias($desc['alias']['name']);`
`371`	`371`	`}`
`372`	`372`	`if (isset($desc['direction'])) {`