Further PHP 7.1 compatibility additions

tpunt · Jun 12, 2017 · 29822ef · 29822ef
1 parent e55ae37
commit 29822ef
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 29 deletions.
diff --git a/src/AstReverter/AstReverter.php b/src/AstReverter/AstReverter.php
@@ -9,6 +9,7 @@
 class AstReverter
 {
     private $indentationLevel = 0;
+    private $inCatchBlock = false;
 
     const INDENTATION_CHAR = ' ';
     const INDENTATION_SIZE = 4;
@@ -283,7 +284,7 @@ private function abstractProp(Node $lhs, $rhs, string $op) : string
     private function argList(Node $node) : string
     {
         return '('
-            . $this->commaSeparatedValues($node)
+            . $this->commaSeparatedValues($node, ', ')
             . ')';
     }
 
@@ -312,7 +313,7 @@ private function array(Node $node) : string
         }
 
         if ($node->children !== []) {
-            $code .= $this->commaSeparatedValues($node);
+            $code .= $this->commaSeparatedValues($node, ', ');
         }
 
         $code .= $closing;
@@ -580,10 +581,14 @@ private function catchList(Node $node) : string
     {
         $code = '';
 
+        $this->inCatchBlock = true;
+
         foreach ($node->children as $catch) {
             $code .= $this->revertAST($catch);
         }
 
+        $this->inCatchBlock = false;
+
         return $code;
     }
 
@@ -702,7 +707,7 @@ private function closure(Node $node) : string
 
         if ($node->children['uses'] !== null) {
             $code .= ' use ('
-                . $this->commaSeparatedValues($node->children['uses'])
+                . $this->commaSeparatedValues($node->children['uses'], ', ')
                 . ')';
         }
 
@@ -753,15 +758,15 @@ private function coalesce(Node $node) : string
      *
      * The NULL check is required for list(,,, $a).
      */
-    private function commaSeparatedValues(Node $node, bool $space = true) : string
+    private function commaSeparatedValues(Node $node, string $separator) : string
     {
         $aggregator = [];
 
         foreach ($node->children as $child) {
             $aggregator[] = ($child === null) ? null : $this->revertAST($child);
         }
 
-        return implode(',' . ($space ? ' ' : ''), $aggregator);
+        return implode($separator, $aggregator);
     }
 
     private function conditional(Node $node) : string
@@ -784,11 +789,28 @@ private function constDecl(Node $node, $setConst = true) : string
     {
         $code = '';
 
+        switch ($node->flags) {
+            case \ast\flags\MODIFIER_PUBLIC:
+                $code = 'public ';
+                break;
+            case \ast\flags\MODIFIER_PROTECTED:
+                $code = 'protected ';
+                break;
+            case \ast\flags\MODIFIER_PRIVATE:
+                $code = 'private ';
+                break;
+            case 0:
+                // nothing to do - for PHP 7.0
+                break;
+            default:
+                assert(false, "Unknown flag ({$node->flags}) for AST_CONST_DECL found.");
+        }
+
         if ($setConst) {
             $code .= 'const ';
         }
 
-        $code .= $this->commaSeparatedValues($node);
+        $code .= $this->commaSeparatedValues($node, ', ');
 
         return $code;
     }
@@ -913,7 +935,7 @@ private function exit(Node $node) : string
 
     private function exprList(Node $node) : string
     {
-        return $this->commaSeparatedValues($node);
+        return $this->commaSeparatedValues($node, ', ');
     }
 
     private function for(Node $node) : string
@@ -1189,7 +1211,7 @@ private function label(Node $node) : string
 
     private function list(Node $node) : string
     {
-        return 'list(' . $this->commaSeparatedValues($node) . ')';
+        return 'list(' . $this->commaSeparatedValues($node, ', ') . ')';
     }
 
     private function magicConst(Node $node)
@@ -1431,7 +1453,7 @@ private function name(Node $node) : string
 
     private function nameList(Node $node) : string
     {
-        return $this->commaSeparatedValues($node);
+        return $this->commaSeparatedValues($node, $this->inCatchBlock ? ' | ' : ', ');
     }
 
     private function namespace(Node $node) : string
@@ -1507,7 +1529,7 @@ private function param(Node $node) : string
     private function paramList(Node $node) : string
     {
         return '('
-            . $this->commaSeparatedValues($node)
+            . $this->commaSeparatedValues($node, ', ')
             . ')';
     }
 
@@ -1573,7 +1595,7 @@ private function propDecl(Node $node) : string
                 assert(false, "Unknown flag(s) ({$node->flags}) for AST_PROP_DECL found.");
         }
 
-        $code .= $scope . $this->commaSeparatedValues($node, false);
+        $code .= $scope . $this->commaSeparatedValues($node, ',');
 
         return $code;
     }
@@ -1853,6 +1875,8 @@ private function type(Node $node) : string
                 return 'iterable';
             case \ast\flags\TYPE_DOUBLE:
                 return 'float';
+            case \ast\flags\TYPE_VOID:
+                return 'void';
             default:
                 assert(false, "Unknown flag ({$node->flags}) for AST_TYPE found.");
         }
@@ -1900,7 +1924,7 @@ private function unset(Node $node) : string
     private function use(Node $node, $setUse = true) : string
     {
         return $this->useAbstract($node, $setUse)
-            . $this->commaSeparatedValues($node);
+            . $this->commaSeparatedValues($node, ', ');
     }
 
     /**
@@ -1968,7 +1992,7 @@ private function useTrait(Node $node) : string
     {
         $code = 'use ';
 
-        $code .= $this->commaSeparatedValues($node->children['traits']);
+        $code .= $this->commaSeparatedValues($node->children['traits'], ', ');
 
         if ($node->children['adaptations'] !== null) {
             $code .= ' {' . PHP_EOL;

diff --git a/tests/AstReverterTests/classConstantDefinitions.test b/tests/AstReverterTests/classConstantDefinitions.test
diff --git a/tests/AstReverterTests/php71.test b/tests/AstReverterTests/php71.test
@@ -4,10 +4,24 @@ Nullable types
 <=======>
 <?php
 
-function foo(?iterable $x, ?callable $y, int $z, iterable $i) : ?callable {}
+function foo(?iterable $x, ?callable $y, int $z, iterable $i) : void {}
+class Something
+{
+    const PUBLIC_CONST_A = 1;
+    public const PUBLIC_CONST_B = 2;
+    protected const PROTECTED_CONST = 3;
+    private const PRIVATE_CONST = 4;
+}
 <=======>
 <?php
 
-function foo(?iterable $x, ?callable $y, int $z, iterable $i) : ?callable
+function foo(?iterable $x, ?callable $y, int $z, iterable $i) : void
+{
+}
+class Something
 {
+    public const PUBLIC_CONST_A = 1;
+    public const PUBLIC_CONST_B = 2;
+    protected const PROTECTED_CONST = 3;
+    private const PRIVATE_CONST = 4;
 }