sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

General: Introduce a polyfill for is_countable() function added in PHP 7.3.

Browse Source 
Props jrf, ayeshrajans, desrosj.
See #43583.

git-svn-id: https://develop.svn.wordpress.org/trunk@43034 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2018-04-30 03:42:46 +00:00
parent a1327b5eb6
commit 8edb00171c
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wp-includes/compat.php
View File

@ -505,3 +505,21 @@ endif;
if ( ! function_exists( 'spl_autoload_register' ) ) { if ( ! function_exists( 'spl_autoload_register' ) ) {
require_once ABSPATH . WPINC . '/spl-autoload-compat.php'; require_once ABSPATH . WPINC . '/spl-autoload-compat.php';
} }
if ( ! function_exists( 'is_countable' ) ) {
/**
* Polyfill for is_countable() function added in PHP 7.3.
*
* Verify that the content of a variable is an array or an object
* implementing Countable.
*
* @since 4.9.6
*
* @param mixed $var The value to check.
*
* @return bool True if `$var` is countable, false otherwise.
*/
function is_countable( $var ) {
return ( is_array( $var ) || $var instanceof Countable );
}
}

53
tests/phpunit/tests/compat.php
View File

@ -186,6 +186,50 @@ EOT;
$this->assertEquals( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) ); $this->assertEquals( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) );
$this->assertEquals( array( 'foo' ), $json->decode( '["foo"]' ) ); $this->assertEquals( array( 'foo' ), $json->decode( '["foo"]' ) );
} }
/**
* @ticket 43583
*/
function test_is_countable_availability() {
$this->assertTrue( function_exists( 'is_countable' ) );
}
/**
* Test is_countable() polyfill.
*
* @ticket 43583
*
* @dataProvider countable_variable_test_data
*/
function test_is_countable_functionality( $variable, $is_countable ) {
$this->assertEquals( is_countable( $variable ), $is_countable );
}
/**
* Data provider for test_is_countable_functionality().
*
* @ticket 43583
*
* @return array {
* @type array {
* @type mixed $variable Variable to check.
* @type bool $is_countable The expected return value of PHP 7.3 is_countable() function.
* }
* }
*/
public function countable_variable_test_data() {
return array(
array( true, false ),
array( new stdClass(), false ),
array( new ArrayIteratorFake(), true ),
array( new CountableFake(), true ),
array( 16, false ),
array( null, false ),
array( array( 1, 2, 3 ), true ),
array( (array) 1, true ),
array( (object) array( 'foo', 'bar', 'baz' ), false ),
);
}
} }
/* used in test_mb_substr_phpcore */ /* used in test_mb_substr_phpcore */
@ -194,3 +238,12 @@ class classA {
return 'Class A object'; return 'Class A object';
} }
} }
class ArrayIteratorFake extends ArrayIterator {
}
class CountableFake implements Countable {
public function count() {
return 16;
}
}