Merge branch '2.3' into 2.5

* 2.3:
  [Doc] Use Markdown syntax highlighting
  [Finder] tweaked docs
  [Finder] Add info about possibilities offered by SplFileInfo
  fix components tests
  [Intl] FIxed failing test
  [Intl] Generated the data for ICU version 54-rc
  [EventDispatcher] fix doc bloc on EventDispatcherInterface
  [Validator] Update validators.zh_CN.xlf, fix translation error
  bumped Symfony version to 2.3.21
  updated VERSION for 2.3.20
  update CONTRIBUTORS for 2.3.20
  updated CHANGELOG for 2.3.20
  [Intl] Integrated ICU data into Intl component

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php

ApcClassLoader.php

@@ -15,7 +15,7 @@ namespace Symfony\Component\ClassLoader;
  * ApcClassLoader implements a wrapping autoloader cached in APC for PHP 5.3.
  *
  * It expects an object implementing a findFile method to find the file. This
- * allow using it as a wrapper around the other loaders of the component (the
+ * allows using it as a wrapper around the other loaders of the component (the
  * ClassLoader and the UniversalClassLoader for instance) but also around any
  * other autoloader following this convention (the Composer one for instance)
  *
@@ -46,7 +46,7 @@ class ApcClassLoader
     /**
      * The class loader object being decorated.
      *
-     * @var \Symfony\Component\ClassLoader\ClassLoader
+     * @var object
      *   A class loader object that implements the findFile() method.
      */
     protected $decorated;
@@ -133,5 +133,4 @@ class ApcClassLoader
     {
         return call_user_func_array(array($this->decorated, $method), $args);
     }
-
 }

ClassMapGenerator.php

@@ -71,7 +71,6 @@ class ClassMapGenerator
             foreach ($classes as $class) {
                 $map[$class] = $path;
             }
-
         }
 
         return $map;

Psr4ClassLoader.php

@@ -32,7 +32,7 @@ class Psr4ClassLoader
     public function addPrefix($prefix, $baseDir)
     {
         $prefix = trim($prefix, '\\').'\\';
-        $baseDir = rtrim($baseDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $baseDir = rtrim($baseDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
         $this->prefixes[] = array($prefix, $baseDir);
     }
 
@@ -49,7 +49,7 @@ class Psr4ClassLoader
             list($currentPrefix, $currentBaseDir) = $current;
             if (0 === strpos($class, $currentPrefix)) {
                 $classWithoutPrefix = substr($class, strlen($currentPrefix));
-                $file = $currentBaseDir . str_replace('\\', DIRECTORY_SEPARATOR, $classWithoutPrefix) . '.php';
+                $file = $currentBaseDir.str_replace('\\', DIRECTORY_SEPARATOR, $classWithoutPrefix).'.php';
                 if (file_exists($file)) {
                     return $file;
                 }

README.md

@@ -9,51 +9,63 @@ standard or the PEAR naming convention.
 
 First, register the autoloader:
 
-    require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+```php
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
-    use Symfony\Component\ClassLoader\UniversalClassLoader;
+use Symfony\Component\ClassLoader\UniversalClassLoader;
 
-    $loader = new UniversalClassLoader();
-    $loader->register();
+$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');
+```php
+$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');
+```php
+$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'));
+```php
+$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',
-    ));
+```php
+$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';
+```php
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
 
-    use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
+use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 
-    $loader = new ApcUniversalClassLoader('apc.prefix.');
+$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

Tests/ApcUniversalClassLoaderTest.php

@@ -55,13 +55,13 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
        $this->assertTrue(class_exists($className), $message);
    }
 
-   public function getLoadClassTests()
-   {
-       return array(
+    public function getLoadClassTests()
+    {
+        return array(
            array('\\Apc\\Namespaced\\Foo', 'Apc\\Namespaced\\Foo',   '->loadClass() loads Apc\Namespaced\Foo class'),
            array('Apc_Pearlike_Foo',    'Apc_Pearlike_Foo',      '->loadClass() loads Apc_Pearlike_Foo class'),
        );
-   }
+    }
 
    /**
     * @dataProvider getLoadClassFromFallbackTests
@@ -77,15 +77,15 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
        $this->assertTrue(class_exists($className), $message);
    }
 
-   public function getLoadClassFromFallbackTests()
-   {
-       return array(
+    public function getLoadClassFromFallbackTests()
+    {
+        return array(
            array('\\Apc\\Namespaced\\Baz',    'Apc\\Namespaced\\Baz',    '->loadClass() loads Apc\Namespaced\Baz class'),
            array('Apc_Pearlike_Baz',       'Apc_Pearlike_Baz',       '->loadClass() loads Apc_Pearlike_Baz class'),
            array('\\Apc\\Namespaced\\FooBar', 'Apc\\Namespaced\\FooBar', '->loadClass() loads Apc\Namespaced\Baz class from fallback dir'),
            array('Apc_Pearlike_FooBar',    'Apc_Pearlike_FooBar',    '->loadClass() loads Apc_Pearlike_Baz class from fallback dir'),
        );
-   }
+    }
 
    /**
     * @dataProvider getLoadClassNamespaceCollisionTests
@@ -100,9 +100,9 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
        $this->assertTrue(class_exists($className), $message);
    }
 
-   public function getLoadClassNamespaceCollisionTests()
-   {
-       return array(
+    public function getLoadClassNamespaceCollisionTests()
+    {
+        return array(
            array(
                array(
                    'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
@@ -136,7 +136,7 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
                '->loadClass() loads NamespaceCollision\A\B\Bar from beta.',
            ),
        );
-   }
+    }
 
    /**
     * @dataProvider getLoadClassPrefixCollisionTests
@@ -150,9 +150,9 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
        $this->assertTrue(class_exists($className), $message);
    }
 
-   public function getLoadClassPrefixCollisionTests()
-   {
-       return array(
+    public function getLoadClassPrefixCollisionTests()
+    {
+        return array(
            array(
                array(
                    'ApcPrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
@@ -186,5 +186,5 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
                '->loadClass() loads ApcPrefixCollision_A_B_Bar from beta.',
            ),
        );
-   }
+    }
 }

Tests/ClassMapGeneratorTest.php

@@ -76,7 +76,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
                 'Namespaced\\Foo'          => realpath(__DIR__).'/Fixtures/Namespaced/Foo.php',
                 'Namespaced\\Baz'          => realpath(__DIR__).'/Fixtures/Namespaced/Baz.php',
                 'Namespaced\\WithComments' => realpath(__DIR__).'/Fixtures/Namespaced/WithComments.php',
-                )
+                ),
             ),
             array(__DIR__.'/Fixtures/beta/NamespaceCollision', array(
                 'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',

Tests/Fixtures/ClassesWithParents/A.php

@@ -2,4 +2,6 @@
 
 namespace ClassesWithParents;
 
-class A extends B {}
+class A extends B
+{
+}

Tests/Fixtures/ClassesWithParents/B.php

@@ -2,4 +2,6 @@
 
 namespace ClassesWithParents;
 
-class B implements CInterface {}
+class B implements CInterface
+{
+}

Tests/Fixtures/classmap/SomeClass.php

@@ -13,5 +13,4 @@ namespace ClassMap;
 
 class SomeClass extends SomeParent implements SomeInterface
 {
-
 }

Tests/Fixtures/classmap/SomeInterface.php

@@ -13,5 +13,4 @@ namespace ClassMap;
 
 interface SomeInterface
 {
-
 }

Tests/Fixtures/classmap/SomeParent.php

@@ -13,5 +13,4 @@ namespace ClassMap;
 
 abstract class SomeParent
 {
-
 }

Tests/Fixtures/classmap/multipleNs.php

@@ -1,14 +1,24 @@
 <?php
 namespace {
-    class A {}
+    class A
+    {
+    }
 }
 
 namespace Alpha {
-    class A {}
-    class B {}
+    class A
+    {
+    }
+    class B
+    {
+    }
 }
 
 namespace Beta {
-    class A {}
-    class B {}
+    class A
+    {
+    }
+    class B
+    {
+    }
 }

Tests/Fixtures/classmap/sameNsMultipleClasses.php

@@ -11,5 +11,9 @@
 
 namespace Foo\Bar;
 
-class A {}
-class B {}
+class A
+{
+}
+class B
+{
+}

Tests/Fixtures/deps/traits.php

@@ -1,7 +1,8 @@
 <?php
 
 trait TD
-{}
+{
+}
 
 trait TZ
 {

Tests/Fixtures/php5.4/traits.php

@@ -25,6 +25,7 @@ namespace Foo {
 
     class CBar implements IBar
     {
-        use TBar, TFooBar;
+        use TBar;
+        use TFooBar;
     }
 }

Tests/Psr4ClassLoaderTest.php

@@ -24,7 +24,7 @@ class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
         $loader = new Psr4ClassLoader();
         $loader->addPrefix(
             'Acme\\DemoLib',
-            __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'psr-4'
+            __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'psr-4'
         );
         $loader->loadClass($className);
         $this->assertTrue(class_exists($className), sprintf('loadClass() should load %s', $className));
@@ -39,7 +39,7 @@ class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
             array('Acme\\DemoLib\\Foo'),
             array('Acme\\DemoLib\\Class_With_Underscores'),
             array('Acme\\DemoLib\\Lets\\Go\\Deeper\\Foo'),
-            array('Acme\\DemoLib\\Lets\\Go\\Deeper\\Class_With_Underscores')
+            array('Acme\\DemoLib\\Lets\\Go\\Deeper\\Class_With_Underscores'),
         );
     }
 
@@ -52,7 +52,7 @@ class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
         $loader = new Psr4ClassLoader();
         $loader->addPrefix(
             'Acme\\DemoLib',
-            __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'psr-4'
+            __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'psr-4'
         );
         $loader->loadClass($className);
         $this->assertFalse(class_exists($className), sprintf('loadClass() should not load %s', $className));
@@ -65,7 +65,7 @@ class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array('Acme\\DemoLib\\I_Do_Not_Exist'),
-            array('UnknownVendor\\SomeLib\\I_Do_Not_Exist')
+            array('UnknownVendor\\SomeLib\\I_Do_Not_Exist'),
         );
     }
 }

UniversalClassLoader.php

@@ -287,7 +287,6 @@ class UniversalClassLoader
                     return $file;
                 }
             }
-
         } else {
             // PEAR-like class name
             $normalizedClass = str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';

XcacheClassLoader.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\ClassLoader;
 
 /**
- * XcacheClassLoader implements a wrapping autoloader cached in Xcache for PHP 5.3.
+ * XcacheClassLoader implements a wrapping autoloader cached in XCache for PHP 5.3.
  *
  * It expects an object implementing a findFile method to find the file. This
  * allows using it as a wrapper around the other loaders of the component (the
@@ -43,31 +43,35 @@ namespace Symfony\Component\ClassLoader;
 class XcacheClassLoader
 {
     private $prefix;
-    private $classFinder;
+
+    /**
+     * @var object A class loader object that implements the findFile() method
+     */
+    private $decorated;
 
     /**
      * Constructor.
      *
-     * @param string $prefix      A prefix to create a namespace in Xcache
-     * @param object $classFinder An object that implements findFile() method.
+     * @param string $prefix      The XCache namespace prefix to use.
+     * @param object $decorated   A class loader object that implements the findFile() method.
      *
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
      *
      * @api
      */
-    public function __construct($prefix, $classFinder)
+    public function __construct($prefix, $decorated)
     {
-        if (!extension_loaded('Xcache')) {
-            throw new \RuntimeException('Unable to use XcacheClassLoader as Xcache is not enabled.');
+        if (!extension_loaded('xcache')) {
+            throw new \RuntimeException('Unable to use XcacheClassLoader as XCache is not enabled.');
         }
 
-        if (!method_exists($classFinder, 'findFile')) {
+        if (!method_exists($decorated, 'findFile')) {
             throw new \InvalidArgumentException('The class finder must implement a "findFile" method.');
         }
 
         $this->prefix = $prefix;
-        $this->classFinder = $classFinder;
+        $this->decorated = $decorated;
     }
 
     /**
@@ -116,10 +120,18 @@ class XcacheClassLoader
         if (xcache_isset($this->prefix.$class)) {
             $file = xcache_get($this->prefix.$class);
         } else {
-            $file = $this->classFinder->findFile($class);
+            $file = $this->decorated->findFile($class);
             xcache_set($this->prefix.$class, $file);
         }
 
         return $file;
     }
+
+    /**
+     * Passes through all unknown calls onto the decorated object.
+     */
+    public function __call($method, $args)
+    {
+        return call_user_func_array(array($this->decorated, $method), $args);
+    }
 }