Changeset 25388

Timestamp:

09/12/2013 05:48:58 AM (11 years ago)

Author:

wonderboymusic

Message:

• Suppress deprecated function notices in tests/theme/themeDir.php
• Set $theme['Template Files'] and $theme['Stylesheet Files'] to a variable before calling array methods upon them - avoids Indirect modification of overloaded element has no effect notice
• Clean up setUp/tearDown in tests/theme.php

See #25282.

Location:

trunk/tests/phpunit/tests

Files:

• theme.php (modified) (2 diffs)
• theme/themeDir.php (modified) (3 diffs)

trunk/tests/phpunit/tests/theme.php

@@ -17 +17 @@
         unset( $GLOBALS['wp_themes'] );
 
-        add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
-    }
-
-    function deprecated_function_run_check( $function ) {
-        if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' ) ) )
-            add_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-    }
-
-    function filter_deprecated_function_trigger_error() {
-        remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-        return false;
+        add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
     }
 
@@ -35 +25 @@
         unset( $GLOBALS['wp_themes'] );
         parent::tearDown();
+
+        remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
+    }
+
+    function deprecated_function_run( $function ) {
+        if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' ) ) )
+            add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+    }
+
+    function deprecated_function_trigger_error() {
+        remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+        return false;
     }
 

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -22 +22 @@
         wp_clean_themes_cache();
         unset( $GLOBALS['wp_themes'] );
+        add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
     }
 
@@ -32 +33 @@
         unset( $GLOBALS['wp_themes'] );
         parent::tearDown();
+        remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
+    }
+
+    function deprecated_function_run( $function ) {
+        if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme', 'get_broken_themes' ) ) )
+            add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+    }
+
+    function deprecated_function_trigger_error() {
+        remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+        return false;
     }
 
@@ -80 +92 @@
         $this->assertEquals( 'sandbox', $theme['Template'] );
         $this->assertEquals( 'sandbox', $theme['Stylesheet'] );
-        $this->assertEquals( $this->theme_root.'/sandbox/functions.php', reset($theme['Template Files']) );
-        $this->assertEquals( $this->theme_root.'/sandbox/index.php', next($theme['Template Files']) );
-
-        $this->assertEquals( $this->theme_root.'/sandbox/style.css', reset($theme['Stylesheet Files']) );
+
+        $template_files = $theme['Template Files'];
+
+        $this->assertEquals( $this->theme_root.'/sandbox/functions.php', reset( $template_files ) );
+        $this->assertEquals( $this->theme_root.'/sandbox/index.php', next( $template_files ) );
+
+        $stylesheet_files = $theme['Stylesheet Files'];
+
+        $this->assertEquals( $this->theme_root.'/sandbox/style.css', reset( $stylesheet_files ) );
 
         $this->assertEquals( $this->theme_root.'/sandbox', $theme['Template Dir'] );