Merge branch '2.2' into 2.3

* 2.2: fixed some typos fixed @expectedException class names Conflicts: src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
fixed @expectedException class names
2026-03-24 17:22:11 +01:00 · 2013-11-25 15:49:41 +01:00 · 2013-11-25 09:44:14 +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
3 changed files with 3 additions and 3 deletions
--- 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
--- a/Tests/ClassCollectionLoaderTest.php
+++ b/Tests/ClassCollectionLoaderTest.php
@@ -189,7 +189,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testUnableToLoadClassException()
    {
Author	SHA1	Message	Date
Fabien Potencier	181f15a84f	Merge branch '2.2' into 2.3 * 2.2: fixed some typos fixed @expectedException class names Conflicts: src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php	2013-11-25 15:49:41 +01:00
Fabien Potencier	0a5217edb6	fixed @expectedException class names	2013-11-25 09:44:14 +01:00
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