updated license year

[ClassLoader] fixed unbracketed namespaces (closes #5747 )
fixed CS (mainly method signatures)
2026-03-24 09:12:18 +01:00 · 2013-01-04 17:59:43 +01:00 · 2012-10-27 17:55:46 +02:00 · 2012-07-09 14:43:50 +02:00 · 2012-04-23 07:37:21 +02:00 · 2012-02-22 10:10:37 +01:00
7 changed files with 131 additions and 27 deletions
--- a/ApcUniversalClassLoader.php
+++ b/ApcUniversalClassLoader.php
@@ -17,7 +17,7 @@ namespace Symfony\Component\ClassLoader;
 * It is able to load classes that use either:
 *
 *  * The technical interoperability standards for PHP 5.3 namespaces and
- *    class names (http://groups.google.com/group/php-standards/web/psr-0-final-proposal);
+ *    class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
 *
 *  * The PEAR naming convention for classes (http://pear.php.net/).
 *
@@ -84,6 +84,8 @@ class ApcUniversalClassLoader extends UniversalClassLoader
     * Finds a file by class name while caching lookups to APC.
     *
     * @param string $class A class name to resolve to file
+     *
+     * @return string|null The path, if found
     */
    public function findFile($class)
    {
--- a/ClassCollectionLoader.php
+++ b/ClassCollectionLoader.php
@@ -18,7 +18,8 @@ namespace Symfony\Component\ClassLoader;
 */
 class ClassCollectionLoader
 {
-    static private $loaded;
+    private static $loaded;
+    private static $useTokenizer = true;

    /**
     * Loads a list of classes and caches them in one big file.
@@ -32,7 +33,7 @@ class ClassCollectionLoader
     *
     * @throws \InvalidArgumentException When class can't be loaded
     */
-    static public function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
+    public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
    {
        // each $name can only be loaded once per PHP process
        if (isset(self::$loaded[$name])) {
@@ -84,7 +85,7 @@ class ClassCollectionLoader
        $files = array();
        $content = '';
        foreach ($classes as $class) {
-            if (!class_exists($class) && !interface_exists($class)) {
+            if (!class_exists($class) && !interface_exists($class) && (!function_exists('trait_exists') || !trait_exists($class))) {
                throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
            }

@@ -123,9 +124,13 @@ class ClassCollectionLoader
     *
     * @return string Namespaces with brackets
     */
-    static public function fixNamespaceDeclarations($source)
+    public static function fixNamespaceDeclarations($source)
    {
-        if (!function_exists('token_get_all')) {
+        if (!function_exists('token_get_all') || !self::$useTokenizer) {
+            if (preg_match('/namespace(.*?)\s*;/', $source)) {
+                $source = preg_replace('/namespace(.*?)(\s*);/', "namespace$1$2\n{", $source)."}\n";
+            }
+
            return $source;
        }

@@ -172,12 +177,12 @@ class ClassCollectionLoader
    /**
     * Writes a cache file.
     *
-     * @param string $file Filename
+     * @param string $file    Filename
     * @param string $content Temporary file content
     *
     * @throws \RuntimeException when a cache file cannot be written
     */
-    static private function writeCacheFile($file, $content)
+    private static function writeCacheFile($file, $content)
    {
        $tmpFile = tempnam(dirname($file), basename($file));
        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
@@ -199,7 +204,7 @@ class ClassCollectionLoader
     *
     * @return string The PHP string with the comments removed
     */
-    static private function stripComments($source)
+    private static function stripComments($source)
    {
        if (!function_exists('token_get_all')) {
            return $source;
@@ -219,4 +224,12 @@ class ClassCollectionLoader

        return $output;
    }
+
+    /**
+     * This method is only useful for testing.
+     */
+    public static function enableTokenizer($bool)
+    {
+        self::$useTokenizer = (Boolean) $bool;
+    }
 }
--- a/DebugUniversalClassLoader.php
+++ b/DebugUniversalClassLoader.php
@@ -21,7 +21,7 @@ class DebugUniversalClassLoader extends UniversalClassLoader
    /**
     * Replaces all regular UniversalClassLoader instances by a DebugUniversalClassLoader ones.
     */
-    static public function enable()
+    public static function enable()
    {
        if (!is_array($functions = spl_autoload_functions())) {
            return;
@@ -54,8 +54,8 @@ class DebugUniversalClassLoader extends UniversalClassLoader
        if ($file = $this->findFile($class)) {
            require $file;

-            if (!class_exists($class, false) && !interface_exists($class, false)) {
-                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". You probably have a typo in the namespace or the class name.', $class, $file));
+            if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
+                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
            }
        }
    }
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 Fabien Potencier
+Copyright (c) 2004-2013 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -0,0 +1,60 @@
+ClassLoader Component
+=====================
+
+ClassLoader loads your project classes automatically if they follow some
+standard PHP conventions.
+
+The Universal ClassLoader is able to autoload classes that implement the PSR-0
+standard or the PEAR naming convention.
+
+First, register the autoloader:
+
+    require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+
+    use Symfony\Component\ClassLoader\UniversalClassLoader;
+
+    $loader = new UniversalClassLoader();
+    $loader->register();
+
+Then, register some namespaces with the `registerNamespace()` method:
+
+    $loader->registerNamespace('Symfony', __DIR__.'/src');
+    $loader->registerNamespace('Monolog', __DIR__.'/vendor/monolog/src');
+
+The `registerNamespace()` method takes a namespace prefix and a path where to
+look for the classes as arguments.
+
+You can also register a sub-namespaces:
+
+    $loader->registerNamespace('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib');
+
+The order of registration is significant and the first registered namespace
+takes precedence over later registered one.
+
+You can also register more than one path for a given namespace:
+
+    $loader->registerNamespace('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src'));
+
+Alternatively, you can use the `registerNamespaces()` method to register more
+than one namespace at once:
+
+    $loader->registerNamespaces(array(
+        'Symfony'          => array(__DIR__.'/src', __DIR__.'/symfony/src'),
+        'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
+        'Doctrine'         => __DIR__.'/vendor/doctrine/lib',
+        'Monolog'          => __DIR__.'/vendor/monolog/src',
+    ));
+
+For better performance, you can use the APC based version of the universal
+class loader:
+
+    require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+    require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
+
+    use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
+
+    $loader = new ApcUniversalClassLoader('apc.prefix.');
+
+Furthermore, the component provides tools to aggregate classes into a single
+file, which is especially useful to improve performance on servers that do not
+provide byte caches.
--- a/UniversalClassLoader.php
+++ b/UniversalClassLoader.php
@@ -17,7 +17,7 @@ namespace Symfony\Component\ClassLoader;
 * It is able to load classes that use either:
 *
 *  * The technical interoperability standards for PHP 5.3 namespaces and
- *    class names (http://groups.google.com/group/php-standards/web/psr-0-final-proposal);
+ *    class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
 *
 *  * The PEAR naming convention for classes (http://pear.php.net/).
 *
@@ -169,8 +169,8 @@ class UniversalClassLoader
    /**
     * Registers a set of classes using the PEAR naming convention.
     *
-     * @param string       $prefix  The classes prefix
-     * @param array|string $paths   The location(s) of the classes
+     * @param string       $prefix The classes prefix
+     * @param array|string $paths  The location(s) of the classes
     *
     * @api
     */
@@ -220,13 +220,15 @@ class UniversalClassLoader
            // namespaced class name
            $namespace = substr($class, 0, $pos);
            foreach ($this->namespaces as $ns => $dirs) {
+                if (0 !== strpos($namespace, $ns)) {
+                    continue;
+                }
+
                foreach ($dirs as $dir) {
-                    if (0 === strpos($namespace, $ns)) {
-                        $className = substr($class, $pos + 1);
-                        $file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
-                        if (file_exists($file)) {
-                            return $file;
-                        }
+                    $className = substr($class, $pos + 1);
+                    $file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
+                    if (file_exists($file)) {
+                        return $file;
                    }
                }
            }
@@ -240,12 +242,14 @@ class UniversalClassLoader
        } else {
            // PEAR-like class name
            foreach ($this->prefixes as $prefix => $dirs) {
+                if (0 !== strpos($class, $prefix)) {
+                    continue;
+                }
+
                foreach ($dirs as $dir) {
-                    if (0 === strpos($class, $prefix)) {
-                        $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
-                        if (file_exists($file)) {
-                            return $file;
-                        }
+                    $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
+                    if (file_exists($file)) {
+                        return $file;
                    }
                }
            }
--- a/composer.json
+++ b/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "symfony/class-loader",
+    "type": "library",
+    "description": "Symfony ClassLoader Component",
+    "keywords": [],
+    "homepage": "http://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "http://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.2"
+    },
+    "autoload": {
+        "psr-0": { "Symfony\\Component\\ClassLoader": "" }
+    },
+    "target-dir": "Symfony/Component/ClassLoader"
+}
Author	SHA1	Message	Date
Fabien Potencier	3527a2b300	updated license year	2013-01-04 17:59:43 +01:00
Fabien Potencier	c393e86a03	[ClassLoader] fixed unbracketed namespaces (closes #5747 )	2012-10-27 17:55:46 +02:00
Fabien Potencier	475b92bd71	fixed CS (mainly method signatures)	2012-07-09 14:43:50 +02:00
Włodzimierz Gajda	6329e84c2d	[2.0][Component][ClassLoader] cs	2012-04-23 07:37:21 +02:00
marc.weistroff	28bf7c891b	Updated LICENSE files copyright	2012-02-22 10:10:37 +01:00
Drak	1c055115cc	[ClassLoader] Update PSR-0 reference.	2012-01-11 09:27:00 +05:45
Fabien Potencier	58e364c99c	removed the version attribute in all composer.json files	2012-01-05 14:51:20 +01:00
Fabien Potencier	788001eb1a	tweaked the README files	2011-12-18 14:22:28 +01:00
Fabien Potencier	67f0ac3a3b	merged branch lsmith77/component_readmes (PR #2561 ) Commits ------- 1e370d7 typo fix 93d8d44 added some more infos about Config 27efd59 added READMEs for the bridges 34fc866 cosmetic tweaks d6af3f1 fixed README for Console 6a72b8c added basic README files for all components Discussion ---------- added basic README files for all components and bridges heavily based on http://fabien.potencier.org/article/49/what-is-symfony2 and the official Symfony2 documentation --------------------------------------------------------------------------- by jmikola at 2011/11/03 13:36:07 -0700 Great work. For syntax highlighting on the PHP snippets, you could add "php" after the three backticks. --------------------------------------------------------------------------- by lsmith77 at 2011/11/03 13:41:29 -0700 done --------------------------------------------------------------------------- by stealth35 at 2011/11/03 13:49:31 -0700 Nice job, but you also need to add `<?php` ex : ``` php <?php use Symfony\Component\DomCrawler\Crawler; $crawler = new Crawler(); $crawler->addContent('<html><body><p>Hello World!</p></body></html>'); print $crawler->filter('body > p')->text(); ``` --------------------------------------------------------------------------- by lsmith77 at 2011/11/03 13:56:57 -0700 done --------------------------------------------------------------------------- by ericclemmons at 2011/11/03 19:57:57 -0700 @lsmith77 Well done! This makes consumption of individual components that much easier, especially now that `composer.json` files have been added. --------------------------------------------------------------------------- by lsmith77 at 2011/11/04 01:18:23 -0700 ok .. fixed the issues you mentioned @fabpot --------------------------------------------------------------------------- by lsmith77 at 2011/11/11 15:00:27 -0800 @fabpot anything else left? seems like an easy merge .. and imho there is considerable benefit for our efforts to spread the word about the components with this PR merged. --------------------------------------------------------------------------- by drak at 2011/11/11 18:54:13 -0800 You know, it might be a nice idea to put a link to the documentation for each component if there is some at symfony.com --------------------------------------------------------------------------- by lsmith77 at 2011/11/12 00:59:14 -0800 i did that in some. but i might have missed a few places. On 12.11.2011, at 03:54, Drak <reply@reply.github.com> wrote: > You know, it might be a nice idea to put a link to the documentation for each component if there is some at symfony.com > > --- > Reply to this email directly or view it on GitHub: > https://github.com/symfony/symfony/pull/2561#issuecomment-2715762 --------------------------------------------------------------------------- by breerly at 2011/11/21 10:28:36 -0800 Pretty excited with this. --------------------------------------------------------------------------- by dbu at 2011/11/24 00:02:50 -0800 is there anything we can help with to make this ready to be merged? --------------------------------------------------------------------------- by lsmith77 at 2011/12/18 02:39:23 -0800 @fabpot: seriously .. if you are not going to deliver something "better" and don't provide a reason what is wrong with this .. then its beyond frustrating. i obviously do not claim that these README's are perfect (and certainly still no replacement for proper documentation), but I do claim that in their current form they are a radical step forward to potential users of the Symfony2 components.	2011-12-18 12:42:02 +01:00
Fabien Potencier	d6b1e57641	bumped Symfony version in composer.json files to 2.0.7	2011-11-17 06:58:47 +01:00
Lukas Kahwe Smith	a0c2e07078	added basic README files for all components heavily inspired by http://fabien.potencier.org/article/49/what-is-symfony2 and the official Symfony2 documentation	2011-11-03 21:11:40 +01:00
Fabien Potencier	2fee8738b2	bumped Symfony version to 2.0.6-DEV	2011-11-02 14:18:45 +01:00
Fabien Potencier	5f7edfdabd	bumped Symfony version in composer.json files to 2.0.5	2011-11-02 12:42:41 +01:00
Fabien Potencier	63d26d0d40	updated composer.json files to contain information about autoloading and target dirs	2011-11-01 12:30:24 +01:00
Fabien Potencier	c36b0fc0ec	[ClassLoader] fixed usage of trait_exists()	2011-10-03 18:02:59 +02:00
Igor Wiedler	b50ee28ebf	[composer] add composer.json	2011-09-27 00:55:43 +02:00
Josef Cech	b6a0da1a46	[ClassLoader] Fixed state when trait_exists doesn't exists	2011-09-25 19:25:50 +02:00
Fabien Potencier	2f6e0035ea	[ClassLoader] added support for PHP 5.4 traits	2011-09-22 09:31:50 +02:00
Fabien Potencier	33066c11cc	[ClassLoader] fixed CS	2011-08-13 10:30:20 +02:00
Baptiste Clavié	040abef35a	got an if-condition out of unnecessary loops in Symfony\Component\ClassLoader\UniversalClassLoader	2011-08-11 16:23:36 +03:00
Jordi Boggiano	c00f87add0	[ClassLoader] Improve exception messages of the debug class loader	2011-07-31 22:59:22 +02:00