From 19124fd1d24d0426743c6e0dd83a5a9eae896e66 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 4 Jan 2018 00:18:30 -0800
Subject: [PATCH 1/1] Update nikic/php-parser to 3.1.3

And fix the only incompatibility in findDeprecated.php. It's OK to throw
exceptions on invalid files since we lint all PHP files so there
should be no invalid ones.

Change-Id: Ie5913c2aae4b521a4b6f805e911e4e2764386b45
---
 RELEASE-NOTES-1.31             | 2 ++
 composer.json                  | 2 +-
 maintenance/findDeprecated.php | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index d18c5cf0ea..30a174a8f8 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -44,6 +44,8 @@ production.
 * Updated jquery.chosen from v0.9.14 to v1.8.2.
 * Updated composer/spdx-licenses from 1.1.4 to
   1.2.0 (development dependency).
+* Updated nikic/php-parser from 2.1.0 to 3.1.3
+  (development dependency).
 * …
 
 ==== New external libraries ====
diff --git a/composer.json b/composer.json
index 6b3e8f74a5..d92ffc9bab 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
 		"justinrainbow/json-schema": "~5.2",
 		"mediawiki/mediawiki-codesniffer": "15.0.0",
 		"monolog/monolog": "~1.22.1",
-		"nikic/php-parser": "2.1.0",
+		"nikic/php-parser": "3.1.3",
 		"nmred/kafka-php": "0.1.5",
 		"phpunit/phpunit": "4.8.36",
 		"psy/psysh": "0.8.11",
diff --git a/maintenance/findDeprecated.php b/maintenance/findDeprecated.php
index 6128d2386d..ec998da6a2 100644
--- a/maintenance/findDeprecated.php
+++ b/maintenance/findDeprecated.php
@@ -132,6 +132,9 @@ class FindDeprecated extends Maintenance {
 		$this->addDescription( 'Find deprecated interfaces' );
 	}
 
+	/**
+	 * @return SplFileInfo[]
+	 */
 	public function getFiles() {
 		global $IP;
 
@@ -163,7 +166,7 @@ class FindDeprecated extends Maintenance {
 			}
 
 			$finder->setCurrentFile( substr( $file->getPathname(), strlen( $IP ) + 1 ) );
-			$nodes = $parser->parse( $code, [ 'throwOnError' => false ] );
+			$nodes = $parser->parse( $code );
 			$traverser->traverse( $nodes );
 
 			if ( $i % $chunkSize === 0 ) {
-- 
2.20.1