Ticket #43583: 43583-improvements.patch

src/wp-includes/compat.php

@@ -520 +520 @@
          * @return bool True if `$var` is countable, false otherwise.
          */
         function is_countable( $var ) {
-                return ( is_array( $var ) || $var instanceof Countable );
+                return ( is_array( $var ) || ( is_object( $var ) && ( $var instanceof \Countable || $var instanceof \SimpleXMLElement || $var instanceof \ResourceBundle ) ) );
         }
 }
 

tests/phpunit/tests/compat.php

@@ -228 +228 @@
                         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),
                 );
         }