Context Navigation

Ticket #43583: 43583-improvements2.patch

File 43583-improvements2.patch, 1.1 KB (added by ayeshrajans, 8 years ago)
Thanks for the suggestions. Appreciate if you could review the updated one. Please note that if `xml` or `intl` extensions are not loaded, this test will issue a warning. Ideally, this test should split for these edge cases and skip the test in PHPUnit if the classes are not available.

diff --git a/src/wp-includes/compat.php b/src/wp-includes/compat.php
index cabe71d211..1c854a267d 100644

  function array_replace_recursive( $base = array(), $replacements = array() ) {
          * @return bool True if `$var` is countable, false otherwise.
          */
         function is_countable( $var ) {
+                return ( is_array( $var ) || $var instanceof Countable );
+                return ( is_array( $var )
+                                                 || $var instanceof Countable
+                                                 || $var instanceof SimpleXMLElement
+                                                 || $var instanceof ResourceBundle
+                );
+        }
+}

diff --git a/tests/phpunit/tests/compat.php b/tests/phpunit/tests/compat.php
index 0f17b2d7a8..58dafd3ae7 100644

  public function countable_variable_test_data() {
                         array( array( 1, 2, 3 ), true ),
                         array( (array) 1, true ),
                         array( (object) array( 'foo', 'bar', 'baz' ), false ),
+                        array( new SimpleXMLElement('<xml><tag>1</tag><tag>2</tag></xml>'), true),
+                        array( new ResourceBundle('en', null), true),
                 );
+        }