Changeset 38383

Timestamp:

08/26/2016 08:50:24 PM (8 years ago)

Author:

wonderboymusic

Message:

Unit Tests: after r38303, replace usage of global $_wp_additional_image_sizes with wp_get_additional_image_sizes().

See #37699.

File:

• trunk/tests/phpunit/tests/media.php (modified) (7 diffs)

trunk/tests/phpunit/tests/media.php

@@ -10 +10 @@
 
     public static function wpSetUpBeforeClass( $factory ) {
-        self::$_sizes = $GLOBALS['_wp_additional_image_sizes'];
+        self::$_sizes = wp_get_additional_image_sizes();
         $GLOBALS['_wp_additional_image_sizes'] = array();
 
@@ -651 +651 @@
      */
     function test_add_image_size() {
-        global $_wp_additional_image_sizes;
-
-        if ( ! isset( $_wp_additional_image_sizes ) ) {
-            $_wp_additional_image_sizes = array();
-        }
+        $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
         remove_image_size( 'test-size' );
@@ -662 +658 @@
         add_image_size( 'test-size', 200, 600 );
 
-        $sizes = $_wp_additional_image_sizes;
+        $sizes = wp_get_additional_image_sizes();
 
         // Clean up
@@ -978 +974 @@
      */
     function test_wp_calculate_image_srcset() {
-        global $_wp_additional_image_sizes;
+        $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
         $year_month = date('Y/m');
@@ -1018 +1014 @@
      */
     function test_wp_calculate_image_srcset_no_date_uploads() {
-        global $_wp_additional_image_sizes;
+        $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
         // Disable date organized uploads
@@ -1100 +1096 @@
      */
     function test_wp_calculate_image_srcset_with_absolute_path_in_meta() {
-        global $_wp_additional_image_sizes;
+        $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
         $year_month = date('Y/m');
@@ -1376 +1372 @@
      */
     function test_wp_get_attachment_image_srcset() {
-        global $_wp_additional_image_sizes;
+        $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
         $image_meta = wp_get_attachment_metadata( self::$large_id );