Index: src/wp-settings.php =================================================================== --- src/wp-settings.php (revision 38385) +++ src/wp-settings.php (working copy) @@ -17,10 +17,9 @@ */ define( 'WPINC', 'wp-includes' ); -// Include files required for initialization. -require( ABSPATH . WPINC . '/load.php' ); -require( ABSPATH . WPINC . '/default-constants.php' ); -require_once( ABSPATH . WPINC . '/plugin.php' ); +require( ABSPATH . WPINC . '/compat.php' ); + +require_once( ABSPATH . WPINC . '/vendor/autoload_52.php' ); /* * These can't be directly globalized in version.php. When updating, @@ -89,15 +88,6 @@ // Define WP_LANG_DIR if not set. wp_set_lang_dir(); -// Load early WordPress files. -require( ABSPATH . WPINC . '/compat.php' ); -require( ABSPATH . WPINC . '/functions.php' ); -require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' ); -require( ABSPATH . WPINC . '/class-wp.php' ); -require( ABSPATH . WPINC . '/class-wp-error.php' ); -require( ABSPATH . WPINC . '/pomo/mo.php' ); -require( ABSPATH . WPINC . '/class-phpass.php' ); - // Include the wpdb class and, if present, a db.php database drop-in. global $wpdb; require_wp_db(); @@ -109,13 +99,8 @@ // Start the WordPress object cache, or an external object cache if the drop-in is present. wp_start_object_cache(); -// Attach the default filters. -require( ABSPATH . WPINC . '/default-filters.php' ); - // Initialize multisite if enabled. if ( is_multisite() ) { - require( ABSPATH . WPINC . '/class-wp-site-query.php' ); - require( ABSPATH . WPINC . '/class-wp-network-query.php' ); require( ABSPATH . WPINC . '/ms-blogs.php' ); require( ABSPATH . WPINC . '/ms-settings.php' ); } elseif ( ! defined( 'MULTISITE' ) ) { @@ -128,96 +113,10 @@ if ( SHORTINIT ) return false; -// Load the L10n library. -require_once( ABSPATH . WPINC . '/l10n.php' ); // Run the installer if WordPress is not installed. wp_not_installed(); -// Load most of WordPress. -require( ABSPATH . WPINC . '/class-wp-walker.php' ); -require( ABSPATH . WPINC . '/class-wp-ajax-response.php' ); -require( ABSPATH . WPINC . '/formatting.php' ); -require( ABSPATH . WPINC . '/capabilities.php' ); -require( ABSPATH . WPINC . '/class-wp-roles.php' ); -require( ABSPATH . WPINC . '/class-wp-role.php' ); -require( ABSPATH . WPINC . '/class-wp-user.php' ); -require( ABSPATH . WPINC . '/class-wp-query.php' ); -require( ABSPATH . WPINC . '/query.php' ); -require( ABSPATH . WPINC . '/date.php' ); -require( ABSPATH . WPINC . '/theme.php' ); -require( ABSPATH . WPINC . '/class-wp-theme.php' ); -require( ABSPATH . WPINC . '/template.php' ); -require( ABSPATH . WPINC . '/user.php' ); -require( ABSPATH . WPINC . '/class-wp-user-query.php' ); -require( ABSPATH . WPINC . '/class-wp-session-tokens.php' ); -require( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' ); -require( ABSPATH . WPINC . '/meta.php' ); -require( ABSPATH . WPINC . '/class-wp-meta-query.php' ); -require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' ); -require( ABSPATH . WPINC . '/general-template.php' ); -require( ABSPATH . WPINC . '/link-template.php' ); -require( ABSPATH . WPINC . '/author-template.php' ); -require( ABSPATH . WPINC . '/post.php' ); -require( ABSPATH . WPINC . '/class-walker-page.php' ); -require( ABSPATH . WPINC . '/class-walker-page-dropdown.php' ); -require( ABSPATH . WPINC . '/class-wp-post-type.php' ); -require( ABSPATH . WPINC . '/class-wp-post.php' ); -require( ABSPATH . WPINC . '/post-template.php' ); -require( ABSPATH . WPINC . '/revision.php' ); -require( ABSPATH . WPINC . '/post-formats.php' ); -require( ABSPATH . WPINC . '/post-thumbnail-template.php' ); -require( ABSPATH . WPINC . '/category.php' ); -require( ABSPATH . WPINC . '/class-walker-category.php' ); -require( ABSPATH . WPINC . '/class-walker-category-dropdown.php' ); -require( ABSPATH . WPINC . '/category-template.php' ); -require( ABSPATH . WPINC . '/comment.php' ); -require( ABSPATH . WPINC . '/class-wp-comment.php' ); -require( ABSPATH . WPINC . '/class-wp-comment-query.php' ); -require( ABSPATH . WPINC . '/class-walker-comment.php' ); -require( ABSPATH . WPINC . '/comment-template.php' ); -require( ABSPATH . WPINC . '/rewrite.php' ); -require( ABSPATH . WPINC . '/class-wp-rewrite.php' ); -require( ABSPATH . WPINC . '/feed.php' ); -require( ABSPATH . WPINC . '/bookmark.php' ); -require( ABSPATH . WPINC . '/bookmark-template.php' ); -require( ABSPATH . WPINC . '/kses.php' ); -require( ABSPATH . WPINC . '/cron.php' ); -require( ABSPATH . WPINC . '/deprecated.php' ); -require( ABSPATH . WPINC . '/script-loader.php' ); -require( ABSPATH . WPINC . '/taxonomy.php' ); -require( ABSPATH . WPINC . '/class-wp-term.php' ); -require( ABSPATH . WPINC . '/class-wp-term-query.php' ); -require( ABSPATH . WPINC . '/class-wp-tax-query.php' ); -require( ABSPATH . WPINC . '/update.php' ); -require( ABSPATH . WPINC . '/canonical.php' ); -require( ABSPATH . WPINC . '/shortcodes.php' ); -require( ABSPATH . WPINC . '/embed.php' ); -require( ABSPATH . WPINC . '/class-wp-embed.php' ); -require( ABSPATH . WPINC . '/class-oembed.php' ); -require( ABSPATH . WPINC . '/class-wp-oembed-controller.php' ); -require( ABSPATH . WPINC . '/media.php' ); -require( ABSPATH . WPINC . '/http.php' ); -require( ABSPATH . WPINC . '/class-http.php' ); -require( ABSPATH . WPINC . '/class-wp-http-streams.php' ); -require( ABSPATH . WPINC . '/class-wp-http-curl.php' ); -require( ABSPATH . WPINC . '/class-wp-http-proxy.php' ); -require( ABSPATH . WPINC . '/class-wp-http-cookie.php' ); -require( ABSPATH . WPINC . '/class-wp-http-encoding.php' ); -require( ABSPATH . WPINC . '/class-wp-http-response.php' ); -require( ABSPATH . WPINC . '/class-wp-http-requests-response.php' ); -require( ABSPATH . WPINC . '/widgets.php' ); -require( ABSPATH . WPINC . '/class-wp-widget.php' ); -require( ABSPATH . WPINC . '/class-wp-widget-factory.php' ); -require( ABSPATH . WPINC . '/nav-menu.php' ); -require( ABSPATH . WPINC . '/nav-menu-template.php' ); -require( ABSPATH . WPINC . '/admin-bar.php' ); -require( ABSPATH . WPINC . '/rest-api.php' ); -require( ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php' ); -require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' ); -require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' ); -require( ABSPATH . WPINC . '/class-wp-locale.php' ); - $GLOBALS['wp_embed'] = new WP_Embed(); // Load multisite-specific files. Index: src/wp-includes/vendor/autoload_52.php =================================================================== --- src/wp-includes/vendor/autoload_52.php (revision 0) +++ src/wp-includes/vendor/autoload_52.php (revision 0) @@ -0,0 +1,7 @@ + + * - Jordi Boggiano + */ + +class xrstf_Composer52_ClassLoader { + private $prefixes = array(); + private $fallbackDirs = array(); + private $useIncludePath = false; + private $classMap = array(); + private $classMapAuthoratative = false; + private $allowUnderscore = false; + + /** + * @param boolean $flag true to allow class names with a leading underscore, false to disable + */ + public function setAllowUnderscore($flag) { + $this->allowUnderscore = (boolean) $flag; + } + + /** + * @return array + */ + public function getPrefixes() { + return $this->prefixes; + } + + /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoratative + */ + public function setClassMapAuthoritative($classMapAuthoratative) { + $this->classMapAuthoratative = $classMapAuthoratative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function getClassMapAuthoratative() { + return $this->classMapAuthoratative; + } + + /** + * @return array + */ + public function getFallbackDirs() { + return $this->fallbackDirs; + } + + /** + * @return array + */ + public function getClassMap() { + return $this->classMap; + } + + /** + * @param array $classMap class to filename map + */ + public function addClassMap(array $classMap) { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } + else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of classes, merging with any others previously set. + * + * @param string $prefix the classes prefix + * @param array|string $paths the location(s) of the classes + * @param bool $prepend prepend the location(s) + */ + public function add($prefix, $paths, $prepend = false) { + if (!$prefix) { + if ($prepend) { + $this->fallbackDirs = array_merge( + (array) $paths, + $this->fallbackDirs + ); + } + else { + $this->fallbackDirs = array_merge( + $this->fallbackDirs, + (array) $paths + ); + } + + return; + } + + if (!isset($this->prefixes[$prefix])) { + $this->prefixes[$prefix] = (array) $paths; + return; + } + + if ($prepend) { + $this->prefixes[$prefix] = array_merge( + (array) $paths, + $this->prefixes[$prefix] + ); + } + else { + $this->prefixes[$prefix] = array_merge( + $this->prefixes[$prefix], + (array) $paths + ); + } + } + + /** + * Registers a set of classes, replacing any others previously set. + * + * @param string $prefix the classes prefix + * @param array|string $paths the location(s) of the classes + */ + public function set($prefix, $paths) { + if (!$prefix) { + $this->fallbackDirs = (array) $paths; + return; + } + + $this->prefixes[$prefix] = (array) $paths; + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + */ + public function setUseIncludePath($useIncludePath) { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() { + return $this->useIncludePath; + } + + /** + * Registers this instance as an autoloader. + */ + public function register() { + spl_autoload_register(array($this, 'loadClass'), true); + } + + /** + * Unregisters this instance as an autoloader. + */ + public function unregister() { + spl_autoload_unregister(array($this, 'loadClass')); + } + + /** + * Loads the given class or interface. + * + * @param string $class the name of the class + * @return bool|null true, if loaded + */ + public function loadClass($class) { + if ($file = $this->findFile($class)) { + include $file; + return true; + } + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class the name of the class + * @return string|null the path, if found + */ + public function findFile($class) { + if ('\\' === $class[0]) { + $class = substr($class, 1); + } + + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + elseif ($this->classMapAuthoratative) { + return false; + } + + $classPath = $this->getClassPath($class); + + foreach ($this->prefixes as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) { + return $dir.DIRECTORY_SEPARATOR.$classPath; + } + } + } + } + + foreach ($this->fallbackDirs as $dir) { + if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) { + return $dir.DIRECTORY_SEPARATOR.$classPath; + } + } + + if ($this->useIncludePath && $file = self::resolveIncludePath($classPath)) { + return $file; + } + + return $this->classMap[$class] = false; + } + + private function getClassPath($class) { + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)).DIRECTORY_SEPARATOR; + $className = substr($class, $pos + 1); + } + else { + // PEAR-like class name + $classPath = null; + $className = $class; + } + + $className = str_replace('_', DIRECTORY_SEPARATOR, $className); + + // restore the prefix + if ($this->allowUnderscore && DIRECTORY_SEPARATOR === $className[0]) { + $className[0] = '_'; + } + + $classPath .= $className.'.php'; + + return $classPath; + } + + public static function resolveIncludePath($classPath) { + $paths = explode(PATH_SEPARATOR, get_include_path()); + + foreach ($paths as $path) { + $path = rtrim($path, '/\\'); + + if ($file = file_exists($path.DIRECTORY_SEPARATOR.$file)) { + return $file; + } + } + + return false; + } +} Index: src/wp-includes/vendor/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php =================================================================== --- src/wp-includes/vendor/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php (revision 0) +++ src/wp-includes/vendor/xrstf/composer-php52/lib/xrstf/Composer52/AutoloadGenerator.php (revision 0) @@ -0,0 +1,346 @@ + + * - Jordi Boggiano + */ + +namespace xrstf\Composer52; + +use Composer\Autoload\AutoloadGenerator as BaseGenerator; +use Composer\Autoload\ClassMapGenerator; +use Composer\Config; +use Composer\Installer\InstallationManager; +use Composer\Package\AliasPackage; +use Composer\Package\PackageInterface; +use Composer\Repository\InstalledRepositoryInterface; +use Composer\Util\Filesystem; + +class AutoloadGenerator extends BaseGenerator { + + /** + * @var bool + */ + private $classMapAuthoritative = false; + + public function __construct() { + // do nothing (but keep this constructor so we can build an instance without the need for an event dispatcher) + } + + /** + * Whether or not generated autoloader considers the class map + * authoritative. + * + * @param bool $classMapAuthoritative + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = (boolean) $classMapAuthoritative; + } + + public function dump(Config $config, InstalledRepositoryInterface $localRepo, PackageInterface $mainPackage, InstallationManager $installationManager, $targetDir, $scanPsr0Packages = false, $suffix = '') { + if ($this->classMapAuthoritative) { + // Force scanPsr0Packages when classmap is authoritative + $scanPsr0Packages = true; + } + + $filesystem = new Filesystem(); + $filesystem->ensureDirectoryExists($config->get('vendor-dir')); + + $cwd = getcwd(); + $basePath = $filesystem->normalizePath($cwd); + $vendorPath = $filesystem->normalizePath(realpath($config->get('vendor-dir'))); + $targetDir = $vendorPath.'/'.$targetDir; + $filesystem->ensureDirectoryExists($targetDir); + + $useGlobalIncludePath = (bool) $config->get('use-include-path'); + $prependAutoloader = $config->get('prepend-autoloader') === false ? 'false' : 'true'; + $classMapAuthoritative = $config->get('classmap-authoritative'); + + $vendorPathCode = $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true); + $vendorPathToTargetDirCode = $filesystem->findShortestPathCode($vendorPath, realpath($targetDir), true); + + $appBaseDirCode = $filesystem->findShortestPathCode($vendorPath, $basePath, true); + $appBaseDirCode = str_replace('__DIR__', '$vendorDir', $appBaseDirCode); + + // add 5.2 compat + $vendorPathCode = str_replace('__DIR__', 'dirname(__FILE__)', $vendorPathCode); + $vendorPathToTargetDirCode = str_replace('__DIR__', 'dirname(__FILE__)', $vendorPathToTargetDirCode); + + $packageMap = $this->buildPackageMap($installationManager, $mainPackage, $localRepo->getCanonicalPackages()); + $autoloads = $this->parseAutoloads($packageMap, $mainPackage); + + // add custom psr-0 autoloading if the root package has a target dir + $targetDirLoader = null; + $mainAutoload = $mainPackage->getAutoload(); + if ($mainPackage->getTargetDir() && !empty($mainAutoload['psr-0'])) { + $levels = count(explode('/', $filesystem->normalizePath($mainPackage->getTargetDir()))); + $prefixes = implode(', ', array_map(function ($prefix) { + return var_export($prefix, true); + }, array_keys($mainAutoload['psr-0']))); + + $baseDirFromTargetDirCode = $filesystem->findShortestPathCode($targetDir, $basePath, true); + + $targetDirLoader = <<isPHP53($functionFile)) { + $filesCode .= '// require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile)."; // disabled because of PHP 5.3 syntax\n"; + } + else { + $filesCode .= ' require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).";\n"; + } + } + + if (!$suffix) { + $suffix = md5(uniqid('', true)); + } + + $includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $basePath, $vendorPath, $vendorPathCode, $appBaseDirCode); + + file_put_contents($vendorPath.'/autoload_52.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix)); + file_put_contents($targetDir.'/autoload_real_52.php', $this->getAutoloadRealFile(true, (bool) $includePathFile, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader)); + + // use stream_copy_to_stream instead of copy + // to work around https://bugs.php.net/bug.php?id=64634 + $sourceLoader = fopen(__DIR__.'/ClassLoader.php', 'r'); + $targetLoader = fopen($targetDir.'/ClassLoader52.php', 'w+'); + stream_copy_to_stream($sourceLoader, $targetLoader); + fclose($sourceLoader); + fclose($targetLoader); + unset($sourceLoader, $targetLoader); + } + + protected function isPHP53($file) { + $tokens = token_get_all(file_get_contents($file)); + $php53 = array(T_DIR, T_GOTO, T_NAMESPACE, T_NS_C, T_NS_SEPARATOR, T_USE); + + // PHP 5.4+ + if (defined('T_TRAIT')) { + $php53[] = T_TRAIT; + $php53[] = T_TRAIT_C; + $php53[] = T_TRAIT_C; + } + + // PHP 5.5+ + if (defined('T_FINALLY')) { + $php53[] = T_FINALLY; + $php53[] = T_YIELD; + } + + foreach ($tokens as $token) { + if (is_array($token) && in_array($token[0], $php53)) { + return true; + } + } + + return false; + } + + protected function getIncludePathsFile(array $packageMap, Filesystem $filesystem, $basePath, $vendorPath, $vendorPathCode, $appBaseDirCode) { + $includePaths = array(); + + foreach ($packageMap as $item) { + list($package, $installPath) = $item; + + if (null !== $package->getTargetDir() && strlen($package->getTargetDir()) > 0) { + $installPath = substr($installPath, 0, -strlen('/'.$package->getTargetDir())); + } + + foreach ($package->getIncludePaths() as $includePath) { + $includePath = trim($includePath, '/'); + $includePaths[] = empty($installPath) ? $includePath : $installPath.'/'.$includePath; + } + } + + if (!$includePaths) { + return; + } + + $includePathsFile = <<getPathCode($filesystem, $basePath, $vendorPath, $path) . ",\n"; + } + + return $includePathsFile . ");\n"; + } + + protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix) { + return << $path) { + $loader->add($namespace, $path); + } + + +PSR0; + + if ($useClassMap) { + $file .= <<<'CLASSMAP' + $classMap = require $dir.'/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } + + +CLASSMAP; + } + + if ($this->classMapAuthoritative) { + $file .= <<<'CLASSMAPAUTHORITATIVE' + $loader->setClassMapAuthoritative(true); + +CLASSMAPAUTHORITATIVE; + } + + if ($useGlobalIncludePath) { + $file .= <<<'INCLUDEPATH' + $loader->setUseIncludePath(true); + + +INCLUDEPATH; + } + + if ($targetDirLoader) { + $file .= <<register($prependAutoloader);{$filesCode} + + return \$loader; + } + +METHOD_FOOTER; + + $file .= $targetDirLoader; + + return $file . <<