Merge branch '2.3' into 2.4

fabpot · fabpot · commit ed1d61b2e23a · 2014-02-11T14:52:09.000+01:00
* 2.3:
  fixed various inconsistencies
  reduced recursion when building DumperPrefixCollection
  renamed variables - making next change more readable
  removing dead code.
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Fixed incorrect handling of image inputs

Conflicts:
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
	src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
	src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
	src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
	src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
diff --git a/Tests/Parser/Handler/NumberHandlerTest.php b/Tests/Parser/Handler/NumberHandlerTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\CssSelector\Parser\Handler\NumberHandler;
 use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 
 class NumberHandlerTest extends AbstractHandlerTest
 {
@@ -46,6 +45,6 @@ protected function generateHandler()
     {
         $patterns = new TokenizerPatterns();
 
-        return new NumberHandler($patterns, new TokenizerEscaping($patterns));
+        return new NumberHandler($patterns);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use Symfony\Component\CssSelector\Parser\Handler\NumberHandler;`
`15`	`15`	`use Symfony\Component\CssSelector\Parser\Token;`
`16`	`16`	`use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;`
`17`		`-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;`
`18`	`17`
`19`	`18`	`class NumberHandlerTest extends AbstractHandlerTest`
`20`	`19`	`{`
`@@ -46,6 +45,6 @@ protected function generateHandler()`
`46`	`45`	`{`
`47`	`46`	`$patterns = new TokenizerPatterns();`
`48`	`47`
`49`		`- return new NumberHandler($patterns, new TokenizerEscaping($patterns));`
	`48`	`+ return new NumberHandler($patterns);`
`50`	`49`	`}`
`51`	`50`	`}`