WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

General: Move the `__autoload()` compat function into its own file to prevent deprecated notices being thrown by the compiler in PHP 7.2. 

The `__autoload()` function is deprecated in PHP 7.2, which means WordPress' own `__autoload()` compat function for PHP 5.2 needs to be moved into a separate file to prevent the PHP 7.2 compiler from complaining.

Props ayeshrajans

See #40109

Built from https://develop.svn.wordpress.org/trunk@41178


git-svn-id: http://core.svn.wordpress.org/trunk@41018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-07-28 01:15:52 +00:00
parent 4f2ef5438f
commit df808fc42d
3 changed files with 110 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
wp-includes/compat.php
View File

@ -488,93 +488,12 @@ if ( ! function_exists( 'array_replace_recursive' ) ) :
} }
endif; endif;
// SPL can be disabled on PHP 5.2 /**
if ( ! function_exists( 'spl_autoload_register' ) ): * Polyfill for the SPL autoloader. In PHP 5.2 (but not 5.3 and later), SPL can
$_wp_spl_autoloaders = array(); * be disabled, and PHP 7.2 raises notices if the compiler finds an __autoload()
* function declaration. Function availability is checked here, and the
/** * autoloader is included only if necessary.
* Autoloader compatibility callback. */
* if ( ! function_exists( 'spl_autoload_register' ) ) {
* @since 4.6.0 require_once ABSPATH . WPINC . '/spl-autoload-compat.php';
* }
* @param string $classname Class to attempt autoloading.
*/
function __autoload( $classname ) {
global $_wp_spl_autoloaders;
foreach ( $_wp_spl_autoloaders as $autoloader ) {
if ( ! is_callable( $autoloader ) ) {
// Avoid the extra warning if the autoloader isn't callable.
continue;
}
call_user_func( $autoloader, $classname );
// If it has been autoloaded, stop processing.
if ( class_exists( $classname, false ) ) {
return;
}
}
}
/**
* Registers a function to be autoloaded.
*
* @since 4.6.0
*
* @param callable $autoload_function The function to register.
* @param bool $throw Optional. Whether the function should throw an exception
* if the function isn't callable. Default true.
* @param bool $prepend Whether the function should be prepended to the stack.
* Default false.
*/
function spl_autoload_register( $autoload_function, $throw = true, $prepend = false ) {
if ( $throw && ! is_callable( $autoload_function ) ) {
// String not translated to match PHP core.
throw new Exception( 'Function not callable' );
}
global $_wp_spl_autoloaders;
// Don't allow multiple registration.
if ( in_array( $autoload_function, $_wp_spl_autoloaders ) ) {
return;
}
if ( $prepend ) {
array_unshift( $_wp_spl_autoloaders, $autoload_function );
} else {
$_wp_spl_autoloaders[] = $autoload_function;
}
}
/**
* Unregisters an autoloader function.
*
* @since 4.6.0
*
* @param callable $function The function to unregister.
* @return bool True if the function was unregistered, false if it could not be.
*/
function spl_autoload_unregister( $function ) {
global $_wp_spl_autoloaders;
foreach ( $_wp_spl_autoloaders as &$autoloader ) {
if ( $autoloader === $function ) {
unset( $autoloader );
return true;
}
}
return false;
}
/**
* Retrieves the registered autoloader functions.
*
* @since 4.6.0
*
* @return array List of autoloader functions.
*/
function spl_autoload_functions() {
return $GLOBALS['_wp_spl_autoloaders'];
}
endif;

100
wp-includes/spl-autoload-compat.php Normal file
View File

@ -0,0 +1,100 @@
<?php
/**
* Polyfill for SPL autoload feature. This file is separate to prevent compiler notices
* on the deprecated __autoload() function.
*
* See https://core.trac.wordpress.org/ticket/41134
*
* @package PHP
* @access private
*/
if ( ! function_exists( 'spl_autoload_register' ) ) {
$_wp_spl_autoloaders = array();
/**
* Autoloader compatibility callback.
*
* @since 4.6.0
*
* @param string $classname Class to attempt autoloading.
*/
function __autoload( $classname ) {
global $_wp_spl_autoloaders;
foreach ( $_wp_spl_autoloaders as $autoloader ) {
if ( ! is_callable( $autoloader ) ) {
// Avoid the extra warning if the autoloader isn't callable.
continue;
}
call_user_func( $autoloader, $classname );
// If it has been autoloaded, stop processing.
if ( class_exists( $classname, false ) ) {
return;
}
}
}
/**
* Registers a function to be autoloaded.
*
* @since 4.6.0
*
* @param callable $autoload_function The function to register.
* @param bool $throw Optional. Whether the function should throw an exception
* if the function isn't callable. Default true.
* @param bool $prepend Whether the function should be prepended to the stack.
* Default false.
*/
function spl_autoload_register( $autoload_function, $throw = true, $prepend = false ) {
if ( $throw && ! is_callable( $autoload_function ) ) {
// String not translated to match PHP core.
throw new Exception( 'Function not callable' );
}
global $_wp_spl_autoloaders;
// Don't allow multiple registration.
if ( in_array( $autoload_function, $_wp_spl_autoloaders ) ) {
return;
}
if ( $prepend ) {
array_unshift( $_wp_spl_autoloaders, $autoload_function );
} else {
$_wp_spl_autoloaders[] = $autoload_function;
}
}
/**
* Unregisters an autoloader function.
*
* @since 4.6.0
*
* @param callable $function The function to unregister.
* @return bool True if the function was unregistered, false if it could not be.
*/
function spl_autoload_unregister( $function ) {
global $_wp_spl_autoloaders;
foreach ( $_wp_spl_autoloaders as &$autoloader ) {
if ( $autoloader === $function ) {
unset( $autoloader );
return true;
}
}
return false;
}
/**
* Retrieves the registered autoloader functions.
*
* @since 4.6.0
*
* @return array List of autoloader functions.
*/
function spl_autoload_functions() {
return $GLOBALS['_wp_spl_autoloaders'];
}
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41177'; $wp_version = '4.9-alpha-41178';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.