Permalink
Browse files

Merge branch '2.3'

* 2.3:
  fixed phpdoc
  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/Serializer/Encoder/XmlEncoder.php
  • Loading branch information...
2 parents c1ae3ba + e5f3ef7 commit 7bb58f990b5c2d8fa0b70d29585eddb52d360a4c @fabpot fabpot committed Sep 19, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 ClassMapGenerator.php
  2. +1 −1 README.md
View
@@ -39,7 +39,7 @@ public static function dump($dirs, $file)
/**
* 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
*/
View
@@ -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

0 comments on commit 7bb58f9

Please sign in to comment.