Merge branch 'WordPress:trunk' into trunk

Author: dd32

phpstan.neon.dist

@@ -57,7 +57,6 @@ includes:
 	- tests/phpstan/baselines/isset.property.neon
 	- tests/phpstan/baselines/method.childParameterType.neon
 	- tests/phpstan/baselines/method.nonObject.neon
-	- tests/phpstan/baselines/method.notFound.neon
 	- tests/phpstan/baselines/method.unused.neon
 	- tests/phpstan/baselines/notIdentical.alwaysTrue.neon
 	- tests/phpstan/baselines/nullCoalesce.offset.neon

src/wp-admin/includes/class-language-pack-upgrader-skin.php

@@ -16,6 +16,14 @@
  * @see WP_Upgrader_Skin
  */
 class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
+	/**
+	 * The upgrader instance.
+	 *
+	 * @since 3.7.0
+	 * @var Language_Pack_Upgrader
+	 */
+	public $upgrader;
+
 	public $language_update        = null;
 	public $done_header            = false;
 	public $done_footer            = false;

src/wp-admin/includes/class-plugin-installer-skin.php

@@ -16,6 +16,14 @@
  * @see WP_Upgrader_Skin
  */
 class Plugin_Installer_Skin extends WP_Upgrader_Skin {
+	/**
+	 * The upgrader instance.
+	 *
+	 * @since 2.8.0
+	 * @var Plugin_Upgrader
+	 */
+	public $upgrader;
+
 	public $api;
 	public $type;
 	public $url;

src/wp-admin/includes/class-plugin-upgrader-skin.php

@@ -16,6 +16,13 @@
  * @see WP_Upgrader_Skin
  */
 class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
+	/**
+	 * The upgrader instance.
+	 *
+	 * @since 2.8.0
+	 * @var Plugin_Upgrader
+	 */
+	public $upgrader;
 
 	/**
 	 * Holds the plugin slug in the Plugin Directory.

src/wp-admin/includes/class-theme-installer-skin.php

@@ -16,6 +16,14 @@
  * @see WP_Upgrader_Skin
  */
 class Theme_Installer_Skin extends WP_Upgrader_Skin {
+	/**
+	 * The upgrader instance.
+	 *
+	 * @since 2.8.0
+	 * @var Theme_Upgrader
+	 */
+	public $upgrader;
+
 	public $api;
 	public $type;
 	public $url;

src/wp-admin/includes/class-theme-upgrader-skin.php

@@ -17,6 +17,14 @@
  */
 class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 
+	/**
+	 * The upgrader instance.
+	 *
+	 * @since 2.8.0
+	 * @var Theme_Upgrader
+	 */
+	public $upgrader;
+
 	/**
 	 * Holds the theme slug in the Theme Directory.
 	 *

tests/phpstan/baselines/method.notFound.neon

@@ -23,11 +23,6 @@ parameters:
 			identifier: property.notFound
 			count: 2
 			path: ../../../src/wp-admin/includes/class-language-pack-upgrader.php
-		-
-			message: '#^Access to an undefined property WP_Upgrader\:\:\$new_plugin_data\.$#'
-			identifier: property.notFound
-			count: 1
-			path: ../../../src/wp-admin/includes/class-plugin-installer-skin.php
 		-
 			message: '#^Access to an undefined property WP_Upgrader_Skin\:\:\$plugin_active\.$#'
 			identifier: property.notFound
@@ -38,11 +33,6 @@ parameters:
 			identifier: property.notFound
 			count: 1
 			path: ../../../src/wp-admin/includes/class-plugin-upgrader.php
-		-
-			message: '#^Access to an undefined property WP_Upgrader\:\:\$new_theme_data\.$#'
-			identifier: property.notFound
-			count: 1
-			path: ../../../src/wp-admin/includes/class-theme-installer-skin.php
 		-
 			message: '#^Access to an undefined property WP_Upgrader_Skin\:\:\$api\.$#'
 			identifier: property.notFound