Merge branch 'WordPress:trunk' into trunk

Author: dd32

tests/phpstan/GlobalDocBlockVisitor.php

@@ -26,6 +26,12 @@
  * visitor closes the gap so PHPStan can use the existing core annotations
  * without each `global` statement needing its own redundant `@var`.
  *
+ * `@global` tags in a docblock attached directly to a `global` statement are
+ * honored as well, and take precedence over the enclosing function's tags.
+ * This makes `@global` sufficient for file-scope `global` statements (e.g. in
+ * templates included into another scope), which have no enclosing function
+ * docblock at all.
+ *
  * Functions that do not document a global, or that import a global the
  * function docblock does not list, are left untouched and continue to
  * resolve as `mixed` — preserving PHPStan's safety guarantees.
@@ -73,11 +79,25 @@ public function enterNode( Node $node ): ?Node {
 			return null;
 		}
 
-		if ( ! ( $node instanceof Node\Stmt\Global_ ) || $this->stack === array() ) {
+		if ( ! ( $node instanceof Node\Stmt\Global_ ) ) {
 			return null;
 		}
 
-		$map = $this->stack[ count( $this->stack ) - 1 ];
+		$map = $this->stack !== array() ? $this->stack[ count( $this->stack ) - 1 ] : array();
+
+		$existing      = $node->getDocComment();
+		$existing_text = $existing !== null ? $existing->getText() : '';
+
+		/*
+		 * Also honor `@global` tags on the docblock attached directly to the
+		 * `global` statement itself. This covers file-scope statements (which
+		 * have no enclosing function docblock) and takes precedence over the
+		 * enclosing function's tags for the same variable.
+		 */
+		if ( $existing_text !== '' ) {
+			$map = array_merge( $map, $this->parse_global_tags( $existing_text ) );
+		}
+
 		if ( $map === array() ) {
 			return null;
 		}
@@ -87,9 +107,7 @@ public function enterNode( Node $node ): ?Node {
 		 * statement so we can leave them alone but still inject `@var` lines for
 		 * the remaining variables in a multi-variable `global $a, $b;` statement.
 		 */
-		$existing       = $node->getDocComment();
-		$existing_text  = $existing !== null ? $existing->getText() : '';
-		$already_typed  = array();
+		$already_typed = array();
 		if ( $existing_text !== '' && preg_match_all( '/@(?:phpstan-)?var\s+[^\n]*?\$(\w+)/', $existing_text, $existing_matches ) > 0 ) {
 			$already_typed = array_flip( $existing_matches[1] );
 		}

tests/phpunit/tests/post/wpAfterInsertPost.php

@@ -187,7 +187,7 @@ public function test_update_via_rest_controller() {
 	public function test_new_post_via_rest_controller() {
 		wp_set_current_user( self::$admin_id );
 
-		$request = new WP_REST_Request( 'POST', sprintf( '/wp/v2/posts' ) );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/posts' );
 		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params(
 			array(