Merge pull request #4879 from ampproject/update/phpstan-1.5

Cherry-pick: Use latest PHPStan version to run its tests and replace deprecated autoload_files option

composer.json

@@ -43,7 +43,7 @@
   "extra": {
     "downloads": {
       "phpstan": {
-        "url": "https://github.com/phpstan/phpstan/releases/download/0.12.14/phpstan.phar",
+        "url": "https://github.com/phpstan/phpstan/raw/master/phpstan.phar",
         "path": "vendor/bin/phpstan",
         "type": "phar"
       }
@@ -102,6 +102,6 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "scripts": {
-    "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan analyze --ansi; fi"
+    "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan --version; phpstan analyze --ansi; fi"
   }
 }

includes/class-amp-comment-walker.php

@@ -81,10 +81,11 @@ public function start_el( &$output, $comment, $depth = 0, $args = [], $id = 0 )
 	 * @param int          $max_depth The maximum hierarchical depth.
 	 * @param int          $page_num The specific page number, beginning with 1.
 	 * @param int          $per_page Per page counter.
+	 * @param mixed        ...$args  Optional additional arguments.
 	 *
 	 * @return string XHTML of the specified page of elements.
 	 */
-	public function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
+	public function paged_walk( $elements, $max_depth, $page_num, $per_page, ...$args ) {
 		if ( empty( $elements ) || $max_depth < -1 ) {
 			return '';
 		}

includes/class-amp-theme-support.php

@@ -1611,16 +1611,6 @@ public static function filter_admin_bar_script_loader_tag( $tag, $handle ) {
 	 * @param string[] $script_handles AMP script handles for components identified during output buffering.
 	 */
 	public static function ensure_required_markup( Document $dom, $script_handles = [] ) {
-		/**
-		 * Elements.
-		 *
-		 * @var DOMElement $meta
-		 * @var DOMElement $script
-		 * @var DOMElement $link
-		 * @var DOMElement $style
-		 * @var DOMElement $noscript
-		 */
-
 		// Gather all links.
 		$links         = [
 			Attribute::REL_PRECONNECT => [
@@ -1636,6 +1626,11 @@ public static function ensure_required_markup( Document $dom, $script_handles =
 			],
 		];
 		$link_elements = $dom->head->getElementsByTagName( Tag::LINK );
+		/**
+		 * Link element.
+		 *
+		 * @var DOMElement $link
+		 */
 		foreach ( $link_elements as $link ) {
 			if ( $link->hasAttribute( Attribute::REL ) ) {
 				$links[ $link->getAttribute( Attribute::REL ) ][] = $link;
@@ -1673,6 +1668,12 @@ public static function ensure_required_markup( Document $dom, $script_handles =
 		$ordered_scripts = [];
 		$head_scripts    = [];
 		$runtime_src     = wp_scripts()->registered[ Amp::RUNTIME ]->src;
+
+		/**
+		 * Script element.
+		 *
+		 * @var DOMElement $script
+		 */
 		foreach ( $dom->head->getElementsByTagName( Tag::SCRIPT ) as $script ) { // Note that prepare_response() already moved body scripts to head.
 			$head_scripts[] = $script;
 		}

includes/sanitizers/class-amp-link-sanitizer.php

@@ -130,12 +130,6 @@ public function add_meta_tag( $content = self::DEFAULT_META_CONTENT ) {
 	 * Process links by adding adding AMP query var to links in paired mode and adding rel=amphtml.
 	 */
 	public function process_links() {
-		/**
-		 * Element.
-		 *
-		 * @var DOMElement $element
-		 */
-
 		// Remove admin bar from DOM to prevent mutating it.
 		$admin_bar_container   = $this->dom->getElementById( 'wpadminbar' );
 		$admin_bar_placeholder = null;
@@ -144,6 +138,11 @@ public function process_links() {
 			$admin_bar_container->parentNode->replaceChild( $admin_bar_placeholder, $admin_bar_container );
 		}
 
+		/**
+		 * Element.
+		 *
+		 * @var DOMElement $element
+		 */
 		foreach ( $this->dom->xpath->query( '//*[ local-name() = "a" or local-name() = "area" ]' ) as $element ) {
 			if ( ! $element->hasAttribute( 'href' ) ) {
 				continue;

lib/common/composer.json

@@ -32,7 +32,7 @@
     },
     "downloads": {
       "phpstan": {
-        "url": "https://github.com/phpstan/phpstan/releases/download/0.12.14/phpstan.phar",
+        "url": "https://github.com/phpstan/phpstan/raw/master/phpstan.phar",
         "path": "vendor/bin/phpstan",
         "type": "phar"
       }
@@ -58,7 +58,7 @@
       "@cs",
       "@analyze"
     ],
-    "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan analyze --ansi; fi",
+    "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan --version; phpstan analyze --ansi; fi",
     "unit": "if [ -z $TEST_SKIP_PHPUNIT ]; then phpunit --colors=always; fi"
   }
 }

lib/common/phpstan.neon.dist

@@ -5,12 +5,6 @@ parameters:
 	level: 4
 	inferPrivatePropertyTypeFromConstructor: true
 	paths:
-		- %currentWorkingDirectory%/src/
-	autoload_files:
-		- %currentWorkingDirectory%/vendor/autoload.php
+		- src/
 	ignoreErrors:
 		- '#^PHPDoc tag @throws with type AmpProject\\Exception\\FailedRemoteRequest is not subtype of Throwable$#'
-		-
-			message: '#^If condition is always false\.$#'
-			path: 'src/Dom/Document.php'
-			# See https://github.com/phpstan/phpstan/issues/3291

lib/optimizer/composer.json

@@ -33,7 +33,7 @@
     },
     "downloads": {
       "phpstan": {
-        "url": "https://github.com/phpstan/phpstan/releases/download/0.12.14/phpstan.phar",
+        "url": "https://github.com/phpstan/phpstan/raw/master/phpstan.phar",
         "path": "vendor/bin/phpstan",
         "type": "phar"
       }
@@ -71,7 +71,7 @@
       "@cs",
       "@analyze"
     ],
-    "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan analyze --ansi; fi",
+    "analyze": "if [ -z $TEST_SKIP_PHPSTAN ]; then phpstan --version; phpstan analyze --ansi; fi",
     "unit": "if [ -z $TEST_SKIP_PHPUNIT ]; then phpunit --colors=always; fi",
     "update-test-specs":  "rm -rf tests/spec && bin/sync-amp-toolbox-test-suite.php"
   }

phpstan.neon.dist

@@ -25,3 +25,7 @@ parameters:
 	ignoreErrors:
 		# Uses func_get_args()
 		- '#^Function apply_filters(_ref_array)? invoked with [34567] parameters, 2 required\.$#'
+		# Missing declaration in PHPStan/PHPStorm stubs
+		# See https://github.com/phpstan/phpstan/issues/3492
+		# and https://github.com/JetBrains/phpstorm-stubs/pull/845
+		- '#^Access to an undefined property DOMNamedNodeMap::\$length.$#'