Merge branch '3.4' into 4.0

fabpot · fabpot · commit 2b71219bf155 · 2017-12-14T11:48:22.000-08:00
* 3.4:
  fixed wrong merge
  Tweak message to be Flex friendly
  [Routing] fixed tests
  Fixing wrong class_exists on interface
  Preserve percent-encoding in URLs when performing redirects in the UrlMatcher
  [Console] Fix a bug when passing a letter that could be an alias
  add missing validation options to XSD file
  Take advantage of AnnotationRegistry::registerUniqueLoader
  [DI] Optimize Container::get() for perf
  fix merge
  Fix tests
  Refactoring tests.
diff --git a/Tests/XPath/TranslatorTest.php b/Tests/XPath/TranslatorTest.php
@@ -37,7 +37,7 @@ public function testXmlLang($css, array $elementsId)
         $translator = new Translator();
         $document = new \SimpleXMLElement(file_get_contents(__DIR__.'/Fixtures/lang.xml'));
         $elements = $document->xpath($translator->cssToXPath($css));
-        $this->assertEquals(count($elementsId), count($elements));
+        $this->assertCount(count($elementsId), $elements);
         foreach ($elements as $element) {
             $this->assertTrue(in_array($element->attributes()->id, $elementsId));
         }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function testXmlLang($css, array $elementsId)`
`37`	`37`	`$translator = new Translator();`
`38`	`38`	`$document = new \SimpleXMLElement(file_get_contents(__DIR__.'/Fixtures/lang.xml'));`
`39`	`39`	`$elements = $document->xpath($translator->cssToXPath($css));`
`40`		`- $this->assertEquals(count($elementsId), count($elements));`
	`40`	`+ $this->assertCount(count($elementsId), $elements);`
`41`	`41`	`foreach ($elements as $element) {`
`42`	`42`	`$this->assertTrue(in_array($element->attributes()->id, $elementsId));`
`43`	`43`	`}`