Merge branch '2.4'

fabpot · fabpot · commit 0defad9842bf · 2013-12-31T15:17:39.000+01:00
* 2.4:
  fixed PSR-0 issues
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -94,7 +94,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 foreach ($choiceHashes as $value) {
                     $hashes[] = spl_object_hash($value);
                 }
-                
+
                 $choiceHashes = $hashes;
             }
 
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\ExpressionLanguage\Tests\Node;
+namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use Symfony\Component\ExpressionLanguage\Lexer;
 use Symfony\Component\ExpressionLanguage\Token;
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\ExpressionLanguage\Tests\Node;
+namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use Symfony\Component\ExpressionLanguage\Parser;
 use Symfony\Component\ExpressionLanguage\Lexer;
diff --git a/src/Symfony/Component/Security/Acl/Tests/Domain/EntryTest.php b/src/Symfony/Component/Security/Acl/Tests/Domain/EntryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
+namespace Symfony\Component\Security\Acl\Tests\Domain;
 
 use Symfony\Component\Security\Acl\Domain\Entry;
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)`
`94`	`94`	`foreach ($choiceHashes as $value) {`
`95`	`95`	`$hashes[] = spl_object_hash($value);`
`96`	`96`	`}`
`97`		`-`
	`97`	`+`
`98`	`98`	`$choiceHashes = $hashes;`
`99`	`99`	`}`
`100`	`100`