<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[37636] trunk/src/wp-includes: Autoload: Introduce shim for SPL autoloading.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37636">37636</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37636","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>rmccue</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-06 03:23:38 +0000 (Mon, 06 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Autoload: Introduce shim for SPL autoloading.
For PHP 5.2, SPL can be disabled. As SPL provides the support for multiple autoloaders, this needs to be shimmed if not available.
Fixes <a href="https://core.trac.wordpress.org/ticket/36926">#36926</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasssimplepiephp">trunk/src/wp-includes/class-simplepie.php</a></li>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasssimplepiephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-simplepie.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-simplepie.php 2016-06-05 12:21:38 UTC (rev 37635)
+++ trunk/src/wp-includes/class-simplepie.php 2016-06-06 03:23:38 UTC (rev 37636)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,35 +29,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( function_exists( 'spl_autoload_register' ) ) {
- /**
- * We autoload classes we may not need.
- *
- * If SPL is disabled, we load all of SimplePie manually.
- *
- * Core.php is not loaded manually, because SimplePie_Core (a deprecated class)
- * was never included in WordPress core.
- */
- spl_autoload_register( 'wp_simplepie_autoload' );
-} else {
- require ABSPATH . WPINC . '/SimplePie/Cache/Base.php';
- require ABSPATH . WPINC . '/SimplePie/Cache/DB.php';
- require ABSPATH . WPINC . '/SimplePie/Cache/File.php';
- require ABSPATH . WPINC . '/SimplePie/Cache/Memcache.php';
- require ABSPATH . WPINC . '/SimplePie/Cache/MySQL.php';
- require ABSPATH . WPINC . '/SimplePie/Caption.php';
- require ABSPATH . WPINC . '/SimplePie/Category.php';
- require ABSPATH . WPINC . '/SimplePie/Copyright.php';
- require ABSPATH . WPINC . '/SimplePie/Credit.php';
- require ABSPATH . WPINC . '/SimplePie/Decode/HTML/Entities.php';
- require ABSPATH . WPINC . '/SimplePie/Enclosure.php';
- require ABSPATH . WPINC . '/SimplePie/gzdecode.php';
- require ABSPATH . WPINC . '/SimplePie/HTTP/Parser.php';
- require ABSPATH . WPINC . '/SimplePie/Net/IPv6.php';
- require ABSPATH . WPINC . '/SimplePie/Rating.php';
- require ABSPATH . WPINC . '/SimplePie/Restriction.php';
- require ABSPATH . WPINC . '/SimplePie/Source.php';
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * We autoload classes we may not need.
+ */
+spl_autoload_register( 'wp_simplepie_autoload' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * SimplePie
</span></span></pre></div>
<a id="trunksrcwpincludescompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2016-06-05 12:21:38 UTC (rev 37635)
+++ trunk/src/wp-includes/compat.php 2016-06-06 03:23:38 UTC (rev 37636)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,3 +434,84 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'random_int' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/random_compat/random.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+// SPL can be disabled on PHP 5.2
+if ( ! function_exists( 'spl_autoload_register' ) ):
+ $_wp_spl_autoloaders = array();
+
+ /**
+ * Autoloader compatibility callback.
+ *
+ * @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;
+ }
+ }
+ }
+
+ /**
+ * Register a function to be autoloaded.
+ *
+ * @param callable $autoload_function The function to register.
+ * @param boolean $throw Should the function throw an exception if the function isn't callable?
+ * @param boolean $prepend Should we prepend the function to the stack?
+ */
+ 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;
+ }
+ }
+
+ /**
+ * Unregister an autoloader function.
+ *
+ * @param callable $function The function to unregister.
+ * @return boolean 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;
+ }
+
+ /**
+ * Get the registered autoloader functions.
+ *
+ * @return array List of autoloader functions.
+ */
+ function spl_autoload_functions() {
+ return $GLOBALS['_wp_spl_autoloaders'];
+ }
+endif;
</ins></span></pre>
</div>
</div>
</body>
</html>