From a1b87bc81e818db00e89ec76a9f6df35d9c5448d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 12 Feb 2019 17:41:52 +0100 Subject: [PATCH] Update PHP-Parser for 7.1 compatibility Signed-off-by: Joas Schilling Signed-off-by: Roeland Jago Douma --- 3rdparty | 2 +- build/OCPSinceChecker.php | 2 +- lib/private/App/CodeChecker/CodeChecker.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty b/3rdparty index 2fac6fcf99..42b675142d 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 2fac6fcf993f9cff25845218c3dccf3617ae14a7 +Subproject commit 42b675142d5c33b585f1bb204e910afeed7e98db diff --git a/build/OCPSinceChecker.php b/build/OCPSinceChecker.php index 04a19b3416..13f58fe255 100644 --- a/build/OCPSinceChecker.php +++ b/build/OCPSinceChecker.php @@ -99,7 +99,7 @@ class SinceTagCheckVisitor extends \PhpParser\NodeVisitorAbstract { echo 'Parsing all files in lib/public for the presence of @since or @deprecated on each method...' . PHP_EOL . PHP_EOL; -$parser = new PhpParser\Parser(new PhpParser\Lexer); +$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7); /* iterate over all .php files in lib/public */ $Directory = new RecursiveDirectoryIterator(dirname(__DIR__) . '/lib/public'); diff --git a/lib/private/App/CodeChecker/CodeChecker.php b/lib/private/App/CodeChecker/CodeChecker.php index d2f6d7451b..8f539897c9 100644 --- a/lib/private/App/CodeChecker/CodeChecker.php +++ b/lib/private/App/CodeChecker/CodeChecker.php @@ -25,9 +25,9 @@ namespace OC\App\CodeChecker; use OC\Hooks\BasicEmitter; -use PhpParser\Lexer; use PhpParser\NodeTraverser; use PhpParser\Parser; +use PhpParser\ParserFactory; use RecursiveCallbackFilterIterator; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; @@ -57,7 +57,7 @@ class CodeChecker extends BasicEmitter { public function __construct(ICheck $checkList, $checkMigrationSchema) { $this->checkList = $checkList; $this->checkMigrationSchema = $checkMigrationSchema; - $this->parser = new Parser(new Lexer); + $this->parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7); } /**