Merge branch 'release/0.9.7'

bobthecow · Aug 11, 2018 · 4f5b6c0 · 4f5b6c0
2 parents 4a2ce86 + cbad8ce
commit 4f5b6c0
Show file tree

Hide file tree

Showing 142 changed files with 1,011 additions and 983 deletions.
diff --git a/composer.json b/composer.json
@@ -14,6 +14,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
+        "ext-json": "*",
+        "ext-tokenizer": "*",
         "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
         "symfony/var-dumper": "~2.7|~3.0|~4.0",
         "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",

diff --git a/src/CodeCleaner.php b/src/CodeCleaner.php
@@ -138,7 +138,7 @@ private function addImplicitDebugContext(array $passes)
         }
 
         try {
-            $code = @file_get_contents($file);
+            $code = @\file_get_contents($file);
             if (!$code) {
                 return;
             }
@@ -169,15 +169,15 @@ private function addImplicitDebugContext(array $passes)
      */
     private static function getDebugFile()
     {
-        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        $trace = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-        foreach (array_reverse($trace) as $stackFrame) {
+        foreach (\array_reverse($trace) as $stackFrame) {
             if (!self::isDebugCall($stackFrame)) {
                 continue;
             }
 
-            if (preg_match('/eval\(/', $stackFrame['file'])) {
-                preg_match_all('/([^\(]+)\((\d+)/', $stackFrame['file'], $matches);
+            if (\preg_match('/eval\(/', $stackFrame['file'])) {
+                \preg_match_all('/([^\(]+)\((\d+)/', $stackFrame['file'], $matches);
 
                 return $matches[1][0];
             }
@@ -214,7 +214,7 @@ private static function isDebugCall(array $stackFrame)
      */
     public function clean(array $codeLines, $requireSemicolons = false)
     {
-        $stmts = $this->parse('<?php ' . implode(PHP_EOL, $codeLines) . PHP_EOL, $requireSemicolons);
+        $stmts = $this->parse('<?php ' . \implode(PHP_EOL, $codeLines) . PHP_EOL, $requireSemicolons);
         if ($stmts === false) {
             return false;
         }
@@ -223,13 +223,13 @@ public function clean(array $codeLines, $requireSemicolons = false)
         $stmts = $this->traverser->traverse($stmts);
 
         // Work around https://github.com/nikic/PHP-Parser/issues/399
-        $oldLocale = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
+        $oldLocale = \setlocale(LC_NUMERIC, 0);
+        \setlocale(LC_NUMERIC, 'C');
 
         $code = $this->printer->prettyPrint($stmts);
 
         // Now put the locale back
-        setlocale(LC_NUMERIC, $oldLocale);
+        \setlocale(LC_NUMERIC, $oldLocale);
 
         return $code;
     }
@@ -307,7 +307,7 @@ private function parseErrorIsEOF(\PhpParser\Error $e)
     {
         $msg = $e->getRawMessage();
 
-        return ($msg === 'Unexpected token EOF') || (strpos($msg, 'Syntax error, unexpected EOF') !== false);
+        return ($msg === 'Unexpected token EOF') || (\strpos($msg, 'Syntax error, unexpected EOF') !== false);
     }
 
     /**
@@ -344,6 +344,6 @@ private function parseErrorIsUnterminatedComment(\PhpParser\Error $e, $code)
 
     private function parseErrorIsTrailingComma(\PhpParser\Error $e, $code)
     {
-        return ($e->getRawMessage() === 'A trailing comma is not allowed here') && (substr(rtrim($code), -1) === ',');
+        return ($e->getRawMessage() === 'A trailing comma is not allowed here') && (\substr(\rtrim($code), -1) === ',');
     }
 }
diff --git a/src/CodeCleaner/AbstractClassPass.php b/src/CodeCleaner/AbstractClassPass.php
@@ -36,11 +36,11 @@ public function enterNode(Node $node)
             $this->abstractMethods = [];
         } elseif ($node instanceof ClassMethod) {
             if ($node->isAbstract()) {
-                $name = sprintf('%s::%s', $this->class->name, $node->name);
+                $name = \sprintf('%s::%s', $this->class->name, $node->name);
                 $this->abstractMethods[] = $name;
 
                 if ($node->stmts !== null) {
-                    $msg = sprintf('Abstract function %s cannot contain body', $name);
+                    $msg = \sprintf('Abstract function %s cannot contain body', $name);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
             }
@@ -55,14 +55,14 @@ public function enterNode(Node $node)
     public function leaveNode(Node $node)
     {
         if ($node instanceof Class_) {
-            $count = count($this->abstractMethods);
+            $count = \count($this->abstractMethods);
             if ($count > 0 && !$node->isAbstract()) {
-                $msg = sprintf(
+                $msg = \sprintf(
                     'Class %s contains %d abstract method%s must therefore be declared abstract or implement the remaining methods (%s)',
                     $node->name,
                     $count,
                     ($count === 1) ? '' : 's',
-                    implode(', ', $this->abstractMethods)
+                    \implode(', ', $this->abstractMethods)
                 );
                 throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
             }

diff --git a/src/CodeCleaner/CalledClassPass.php b/src/CodeCleaner/CalledClassPass.php
@@ -58,9 +58,9 @@ public function enterNode(Node $node)
                 return;
             }
 
-            $name = strtolower($node->name);
-            if (in_array($name, ['get_class', 'get_called_class'])) {
-                $msg = sprintf('%s() called without object from outside a class', $name);
+            $name = \strtolower($node->name);
+            if (\in_array($name, ['get_class', 'get_called_class'])) {
+                $msg = \sprintf('%s() called without object from outside a class', $name);
                 throw new ErrorException($msg, 0, E_USER_WARNING, null, $node->getLine());
             }
         }
@@ -78,6 +78,6 @@ public function leaveNode(Node $node)
 
     private function isNull(Node $node)
     {
-        return $node->value instanceof ConstFetch && strtolower($node->value->name) === 'null';
+        return $node->value instanceof ConstFetch && \strtolower($node->value->name) === 'null';
     }
 }
diff --git a/src/CodeCleaner/FinalClassPass.php b/src/CodeCleaner/FinalClassPass.php
@@ -41,13 +41,13 @@ public function enterNode(Node $node)
             if ($node->extends) {
                 $extends = (string) $node->extends;
                 if ($this->isFinalClass($extends)) {
-                    $msg = sprintf('Class %s may not inherit from final class (%s)', $node->name, $extends);
+                    $msg = \sprintf('Class %s may not inherit from final class (%s)', $node->name, $extends);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
             }
 
             if ($node->isFinal()) {
-                $this->finalClasses[strtolower($node->name)] = true;
+                $this->finalClasses[\strtolower($node->name)] = true;
             }
         }
     }
@@ -59,8 +59,8 @@ public function enterNode(Node $node)
      */
     private function isFinalClass($name)
     {
-        if (!class_exists($name)) {
-            return isset($this->finalClasses[strtolower($name)]);
+        if (!\class_exists($name)) {
+            return isset($this->finalClasses[\strtolower($name)]);
         }
 
         $refl = new \ReflectionClass($name);

diff --git a/src/CodeCleaner/FunctionReturnInWriteContextPass.php b/src/CodeCleaner/FunctionReturnInWriteContextPass.php
@@ -36,7 +36,7 @@ class FunctionReturnInWriteContextPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>=');
+        $this->atLeastPhp55 = \version_compare(PHP_VERSION, '5.5', '>=');
     }
 
     /**

diff --git a/src/CodeCleaner/ImplicitReturnPass.php b/src/CodeCleaner/ImplicitReturnPass.php
@@ -49,7 +49,7 @@ private function addImplicitReturn(array $nodes)
             return [new Return_(NoReturnValue::create())];
         }
 
-        $last = end($nodes);
+        $last = \end($nodes);
 
         // Special case a few types of statements to add an implicit return
         // value (even though they technically don't have any return value)
@@ -68,22 +68,22 @@ private function addImplicitReturn(array $nodes)
         } elseif ($last instanceof Switch_) {
             foreach ($last->cases as $case) {
                 // only add an implicit return to cases which end in break
-                $caseLast = end($case->stmts);
+                $caseLast = \end($case->stmts);
                 if ($caseLast instanceof Break_) {
-                    $case->stmts = $this->addImplicitReturn(array_slice($case->stmts, 0, -1));
+                    $case->stmts = $this->addImplicitReturn(\array_slice($case->stmts, 0, -1));
                     $case->stmts[] = $caseLast;
                 }
             }
         } elseif ($last instanceof Expr && !($last instanceof Exit_)) {
             // @codeCoverageIgnoreStart
-            $nodes[count($nodes) - 1] = new Return_($last, [
+            $nodes[\count($nodes) - 1] = new Return_($last, [
                 'startLine' => $last->getLine(),
                 'endLine'   => $last->getLine(),
             ]);
         // @codeCoverageIgnoreEnd
         } elseif ($last instanceof Expression && !($last->expr instanceof Exit_)) {
             // For PHP Parser 4.x
-            $nodes[count($nodes) - 1] = new Return_($last->expr, [
+            $nodes[\count($nodes) - 1] = new Return_($last->expr, [
                 'startLine' => $last->getLine(),
                 'endLine'   => $last->getLine(),
             ]);

diff --git a/src/CodeCleaner/LegacyEmptyPass.php b/src/CodeCleaner/LegacyEmptyPass.php
@@ -28,7 +28,7 @@ class LegacyEmptyPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>=');
+        $this->atLeastPhp55 = \version_compare(PHP_VERSION, '5.5', '>=');
     }
 
     /**
@@ -49,7 +49,7 @@ public function enterNode(Node $node)
         }
 
         if (!$node->expr instanceof Variable) {
-            $msg = sprintf('syntax error, unexpected %s', $this->getUnexpectedThing($node->expr));
+            $msg = \sprintf('syntax error, unexpected %s', $this->getUnexpectedThing($node->expr));
 
             throw new ParseErrorException($msg, $node->expr->getLine());
         }
@@ -61,7 +61,7 @@ private function getUnexpectedThing(Node $node)
             case 'Scalar_String':
             case 'Scalar_LNumber':
             case 'Scalar_DNumber':
-                return json_encode($node->value);
+                return \json_encode($node->value);
 
             case 'Expr_ConstFetch':
                 return (string) $node->name;

diff --git a/src/CodeCleaner/ListPass.php b/src/CodeCleaner/ListPass.php
@@ -28,7 +28,7 @@ class ListPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp71 = version_compare(PHP_VERSION, '7.1', '>=');
+        $this->atLeastPhp71 = \version_compare(PHP_VERSION, '7.1', '>=');
     }
 
     /**

diff --git a/src/CodeCleaner/LoopContextPass.php b/src/CodeCleaner/LoopContextPass.php
@@ -62,23 +62,23 @@ public function enterNode(Node $node)
                 $operator = $node instanceof Break_ ? 'break' : 'continue';
 
                 if ($this->loopDepth === 0) {
-                    $msg = sprintf("'%s' not in the 'loop' or 'switch' context", $operator);
+                    $msg = \sprintf("'%s' not in the 'loop' or 'switch' context", $operator);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
 
                 if ($node->num instanceof LNumber || $node->num instanceof DNumber) {
                     $num = $node->num->value;
                     if ($node->num instanceof DNumber || $num < 1) {
-                        $msg = sprintf("'%s' operator accepts only positive numbers", $operator);
+                        $msg = \sprintf("'%s' operator accepts only positive numbers", $operator);
                         throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                     }
 
                     if ($num > $this->loopDepth) {
-                        $msg = sprintf("Cannot '%s' %d levels", $operator, $num);
+                        $msg = \sprintf("Cannot '%s' %d levels", $operator, $num);
                         throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                     }
                 } elseif ($node->num) {
-                    $msg = sprintf("'%s' operator with non-constant operand is no longer supported", $operator);
+                    $msg = \sprintf("'%s' operator with non-constant operand is no longer supported", $operator);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
                 break;

diff --git a/src/CodeCleaner/NamespaceAwarePass.php b/src/CodeCleaner/NamespaceAwarePass.php
@@ -59,13 +59,13 @@ public function enterNode(Node $node)
     protected function getFullyQualifiedName($name)
     {
         if ($name instanceof FullyQualifiedName) {
-            return implode('\\', $name->parts);
+            return \implode('\\', $name->parts);
         } elseif ($name instanceof Name) {
             $name = $name->parts;
-        } elseif (!is_array($name)) {
+        } elseif (!\is_array($name)) {
             $name = [$name];
         }
 
-        return implode('\\', array_merge($this->namespace, $name));
+        return \implode('\\', \array_merge($this->namespace, $name));
     }
 }
diff --git a/src/CodeCleaner/NamespacePass.php b/src/CodeCleaner/NamespacePass.php
@@ -53,7 +53,7 @@ public function beforeTraverse(array $nodes)
             return $nodes;
         }
 
-        $last = end($nodes);
+        $last = \end($nodes);
 
         if ($last instanceof Namespace_) {
             $kind = $last->getAttribute('kind');

diff --git a/src/CodeCleaner/PassableByReferencePass.php b/src/CodeCleaner/PassableByReferencePass.php
@@ -56,7 +56,7 @@ public function enterNode(Node $node)
             }
 
             foreach ($refl->getParameters() as $key => $param) {
-                if (array_key_exists($key, $node->args)) {
+                if (\array_key_exists($key, $node->args)) {
                     $arg = $node->args[$key];
                     if ($param->isPassedByReference() && !$this->isPassableByReference($arg)) {
                         throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine());

diff --git a/src/CodeCleaner/RequirePass.php b/src/CodeCleaner/RequirePass.php
@@ -79,16 +79,16 @@ public static function resolve($file, $lineNumber = null)
             // @todo Shell::handleError would be better here, because we could
             // fake the file and line number, but we can't call it statically.
             // So we're duplicating some of the logics here.
-            if (E_WARNING & error_reporting()) {
+            if (E_WARNING & \error_reporting()) {
                 ErrorException::throwException(E_WARNING, 'Filename cannot be empty', null, $lineNumber);
             } else {
                 // @todo trigger an error as fallback? this is pretty ugly…
                 // trigger_error('Filename cannot be empty', E_USER_WARNING);
             }
         }
 
-        if ($file === '' || !stream_resolve_include_path($file)) {
-            $msg = sprintf("Failed opening required '%s'", $file);
+        if ($file === '' || !\stream_resolve_include_path($file)) {
+            $msg = \sprintf("Failed opening required '%s'", $file);
             throw new FatalErrorException($msg, 0, E_ERROR, null, $lineNumber);
         }
 
@@ -97,6 +97,6 @@ public static function resolve($file, $lineNumber = null)
 
     private function isRequireNode(Node $node)
     {
-        return $node instanceof Include_ && in_array($node->type, self::$requireTypes);
+        return $node instanceof Include_ && \in_array($node->type, self::$requireTypes);
     }
 }
diff --git a/src/CodeCleaner/StrictTypesPass.php b/src/CodeCleaner/StrictTypesPass.php
@@ -36,7 +36,7 @@ class StrictTypesPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp7 = version_compare(PHP_VERSION, '7.0', '>=');
+        $this->atLeastPhp7 = \version_compare(PHP_VERSION, '7.0', '>=');
     }
 
     /**
@@ -75,10 +75,10 @@ public function beforeTraverse(array $nodes)
         }
 
         if ($prependStrictTypes) {
-            $first = reset($nodes);
+            $first = \reset($nodes);
             if (!$first instanceof Declare_) {
                 $declare = new Declare_([new DeclareDeclare('strict_types', new LNumber(1))]);
-                array_unshift($nodes, $declare);
+                \array_unshift($nodes, $declare);
             }
         }