Merge pull request #4738 from ampproject/always-download-latest-phpstan

Always download latest version of PHPStan

Author: westonruter

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/releases/latest/download/phpstan.phar",
         "path": "vendor/bin/phpstan",
         "type": "phar"
       }
@@ -101,6 +101,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"
   }
 }

composer.lock

@@ -1600,16 +1600,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 => [
@@ -1625,6 +1615,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;
@@ -1662,6 +1657,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/class-amp-theme-support.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;

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

@@ -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/releases/latest/download/phpstan.phar",
         "path": "vendor/bin/phpstan",
         "type": "phar"
       }

lib/common/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/releases/latest/download/phpstan.phar",
         "path": "vendor/bin/phpstan",
         "type": "phar"
       }