Changeset 38355 for trunk/tests/phpunit/tests/general/template.php

Timestamp:

08/25/2016 07:08:38 PM (3 years ago)

Author:

wonderboymusic

Message:

Site Icon: There is no good reason for class-wp-site-icon.php to drop a global instance of itself whenever the file is loaded. The lone use of the global instance of WP_Site_Icon is in an AJAX action that provides virtually no way to override - the file is loaded immediately before the global is used.

Let us remove the $wp_site_icon global. I will fall on the sword if this comes back to bite us (waiting with bated breath).

See #37699.

File:

• trunk/tests/phpunit/tests/general/template.php (modified) (2 diffs)

trunk/tests/phpunit/tests/general/template.php

@@ -1 +1 @@
 <?php
-
 /**
  * A set of unit tests for functions in wp-includes/general-template.php
  *
  * @group template
+ * @group site_icon
  */
+
+require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' );
+
 class Tests_General_Template extends WP_UnitTestCase {
-
-    public $wp_site_icon;
+    protected $wp_site_icon;
     public $site_icon_id;
     public $site_icon_url;
@@ -18 +20 @@
         parent::setUp();
 
-        require_once ABSPATH . 'wp-admin/includes/class-wp-site-icon.php';
-        $this->wp_site_icon = $GLOBALS['wp_site_icon'];
+        $this->wp_site_icon = new WP_Site_Icon();
     }