Laravel version update

Laravel version update

vendor/nikic/php-parser/test_old/run.php

@@ -83,18 +83,15 @@ switch ($testType) {
 | Zend.tests.multibyte.multibyte_encoding_001
 | Zend.tests.multibyte.multibyte_encoding_004
 | Zend.tests.multibyte.multibyte_encoding_005
-# token_get_all bug (https://bugs.php.net/bug.php?id=60097)
-| Zend.tests.bug47516
 # pretty print difference due to INF vs 1e1000
 | ext.standard.tests.general_functions.bug27678
 | tests.lang.bug24640
+# pretty print differences due to negative LNumbers
+| Zend.tests.neg_num_string
+| Zend.tests.bug72918
 # pretty print difference due to nop statements
 | ext.mbstring.tests.htmlent
 | ext.standard.tests.file.fread_basic
-# tests using __halt_compiler as semi reserved keyword
-| Zend.tests.grammar.semi_reserved_001
-| Zend.tests.grammar.semi_reserved_002
-| Zend.tests.grammar.semi_reserved_005
 )\.phpt$~x', $file)) {
                 return null;
             }
@@ -113,17 +110,24 @@ switch ($testType) {
         showHelp('Test type must be one of: PHP5, PHP7 or Symfony');
 }
 
-require_once dirname(__FILE__) . '/../lib/PhpParser/Autoloader.php';
-PhpParser\Autoloader::register();
+require_once __DIR__ . '/../vendor/autoload.php';
 
-$parserName    = 'PhpParser\Parser\\' . $version;
-$parser        = new $parserName(new PhpParser\Lexer\Emulative);
+$lexer = new PhpParser\Lexer\Emulative(['usedAttributes' => [
+    'comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos',
+]]);
+$parserName = 'PhpParser\Parser\\' . $version;
+/** @var PhpParser\Parser $parser */
+$parser = new $parserName($lexer);
 $prettyPrinter = new PhpParser\PrettyPrinter\Standard;
-$nodeDumper    = new PhpParser\NodeDumper;
+$nodeDumper = new PhpParser\NodeDumper;
 
-$parseFail = $ppFail = $compareFail = $count = 0;
+$cloningTraverser = new PhpParser\NodeTraverser;
+$cloningTraverser->addVisitor(new PhpParser\NodeVisitor\CloningVisitor);
 
-$readTime = $parseTime = $ppTime = $reparseTime = $compareTime = 0;
+$parseFail = $fpppFail = $ppFail = $compareFail = $count = 0;
+
+$readTime = $parseTime = $cloneTime = 0;
+$fpppTime = $ppTime = $reparseTime = $compareTime = 0;
 $totalStartTime = microtime(true);
 
 foreach (new RecursiveIteratorIterator(
@@ -135,10 +139,10 @@ foreach (new RecursiveIteratorIterator(
     }
 
     $startTime = microtime(true);
-    $code = file_get_contents($file);
+    $origCode = file_get_contents($file);
     $readTime += microtime(true) - $startTime;
 
-    if (null === $code = $codeExtractor($file, $code)) {
+    if (null === $origCode = $codeExtractor($file, $origCode)) {
         continue;
     }
 
@@ -152,11 +156,30 @@ foreach (new RecursiveIteratorIterator(
 
     try {
         $startTime = microtime(true);
-        $stmts = $parser->parse($code);
+        $origStmts = $parser->parse($origCode);
         $parseTime += microtime(true) - $startTime;
 
+        $origTokens = $lexer->getTokens();
+
         $startTime = microtime(true);
-        $code = '<?php' . "\n" . $prettyPrinter->prettyPrint($stmts);
+        $stmts = $cloningTraverser->traverse($origStmts);
+        $cloneTime += microtime(true) - $startTime;
+
+        $startTime = microtime(true);
+        $code = $prettyPrinter->printFormatPreserving($stmts, $origStmts, $origTokens);
+        $fpppTime += microtime(true) - $startTime;
+
+        if ($code !== $origCode) {
+            echo $file, ":\n Result of format-preserving pretty-print differs\n";
+            if ($verbose) {
+                echo "FPPP output:\n=====\n$code\n=====\n\n";
+            }
+
+            ++$fpppFail;
+        }
+
+        $startTime = microtime(true);
+        $code = "<?php\n" . $prettyPrinter->prettyPrint($stmts);
         $ppTime += microtime(true) - $startTime;
 
         try {
@@ -203,6 +226,9 @@ if (0 === $parseFail && 0 === $ppFail && 0 === $compareFail) {
     if (0 !== $ppFail) {
         echo '    ', $ppFail,      ' pretty print failures.', "\n";
     }
+    if (0 !== $fpppFail) {
+        echo '    ', $fpppFail,      ' FPPP failures.', "\n";
+    }
     if (0 !== $compareFail) {
         echo '    ', $compareFail, ' compare failures.',      "\n";
     }
@@ -213,6 +239,8 @@ echo "\n",
      "\n",
      'Reading files took:   ', $readTime,    "\n",
      'Parsing took:         ', $parseTime,   "\n",
+     'Cloning took:         ', $cloneTime,   "\n",
+     'FPPP took:            ', $fpppTime,    "\n",
      'Pretty printing took: ', $ppTime,      "\n",
      'Reparsing took:       ', $reparseTime, "\n",
      'Comparing took:       ', $compareTime, "\n",