Merge branch '2.2' into 2.3

* 2.2: Fix some annotates [FrameworkBundle] made sure that the debug event dispatcher is used everywhere [HttpKernel] remove unneeded strtoupper updated the composer install command to reflect changes in Composer Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/README.md src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
Fix some annotates
2026-03-24 17:22:11 +01:00 · 2013-09-19 11:45:20 +02:00 · 2013-09-19 11:36:05 +02:00 · 2013-09-18 09:27:26 +02:00 · 2013-08-13 22:18:00 +02:00 · 2013-08-09 09:16:43 +02:00
3 changed files with 3 additions and 3 deletions
--- a/ClassLoader.php
+++ b/ClassLoader.php
@@ -177,7 +177,7 @@ class ClassLoader
        $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';

        foreach ($this->prefixes as $prefix => $dirs) {
-            if (0 === strpos($class, $prefix)) {
+            if ($class === strstr($class, $prefix)) {
                foreach ($dirs as $dir) {
                    if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
                        return $dir.DIRECTORY_SEPARATOR.$classPath;
--- a/ClassMapGenerator.php
+++ b/ClassMapGenerator.php
@@ -39,7 +39,7 @@ class ClassMapGenerator
    /**
     * Iterate over all files in the given directory searching for classes
     *
-     * @param Iterator|string $dir The directory to search in or an iterator
+     * @param \Iterator|string $dir The directory to search in or an iterator
     *
     * @return array A class map array
     */
--- a/README.md
+++ b/README.md
@@ -65,5 +65,5 @@ Resources
 You can run the unit tests with the following command:

    $ cd path/to/Symfony/Component/ClassLoader/
-    $ composer.phar install --dev
+    $ composer.phar install
    $ phpunit
Author	SHA1	Message	Date
Fabien Potencier	e5f3ef7ebd	Merge branch '2.2' into 2.3 * 2.2: Fix some annotates [FrameworkBundle] made sure that the debug event dispatcher is used everywhere [HttpKernel] remove unneeded strtoupper updated the composer install command to reflect changes in Composer Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/README.md src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php	2013-09-19 11:45:20 +02:00
bronze1man	77f69969b1	Fix some annotates	2013-09-19 11:36:05 +02:00
Fabien Potencier	8478872572	updated the composer install command to reflect changes in Composer	2013-09-18 09:27:26 +02:00
Fabien Potencier	622d370a07	Merge branch '2.2' into 2.3 * 2.2: corrected English grammar (s/does not exists/does not exist) [Process] Add more precision to Process::stop timeout [Process] Avoid zombie process in case of unit tests failure [Process] Fix #8739 [Process] Add failing test for #8739 [Process] Fix CS Fixed documentation grammar for AuthenticationManagerInterface::authenticate() [Validator] fixed the wrong isAbstract() check against the class (fixed #8589) [TwigBridge] Prevent code extension to display warning Use strstr instead of strpos Conflicts: src/Symfony/Component/Finder/Shell/Command.php src/Symfony/Component/Process/Process.php	2013-08-13 22:18:00 +02:00
Lee Rowlands	827c54ee98	Use strstr instead of strpos	2013-08-09 09:16:43 +02:00