diff vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

--- a/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php	Thu Feb 28 13:21:36 2019 +0000
@@ -5,8 +5,6 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt;
 
-require_once __DIR__ . '/CodeTestAbstract.php';
-
 class CodeParsingTest extends CodeTestAbstract
 {
     /**
@@ -52,7 +50,8 @@
         ];
     }
 
-    private function getParseOutput(Parser $parser, $code, array $modes) {
+    // Must be public for updateTests.php
+    public function getParseOutput(Parser $parser, $code, array $modes) {
         $dumpPositions = isset($modes['positions']);
 
         $errors = new ErrorHandler\Collecting;
@@ -78,9 +77,9 @@
     private function formatErrorMessage(Error $e, $code) {
         if ($e->hasColumnInfo()) {
             return $e->getMessageWithColumnInfo($code);
-        } else {
-            return $e->getMessage();
         }
+
+        return $e->getMessage();
     }
 
     private function checkAttributes($stmts) {