Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 1f8fa58d9b3e · 2019-10-02T10:48:21.000+02:00
* 4.3:
  Sync Twig templateExists behaviors
  Fix the :only-of-type pseudo class selector
  [Serializer] Add CsvEncoder tests for PHP 7.4
  Copy phpunit.xsd to a predictable path
  [Security/Http] fix parsing X509 emailAddress
  [Serializer] fix denormalization of string-arrays with only one element #33731
  [Cache] fix known tag versions ttl check
diff --git a/Tests/XPath/TranslatorTest.php b/Tests/XPath/TranslatorTest.php
@@ -98,7 +98,7 @@ public function testXmlLang($css, array $elementsId)
         $elements = $document->xpath($translator->cssToXPath($css));
         $this->assertCount(\count($elementsId), $elements);
         foreach ($elements as $element) {
-            $this->assertTrue(\in_array($element->attributes()->id, $elementsId));
+            $this->assertContains((string) $element->attributes()->id, $elementsId);
         }
     }
 
@@ -116,7 +116,7 @@ public function testHtmlIds($css, array $elementsId)
         $this->assertCount(\count($elementsId), $elementsId);
         foreach ($elements as $element) {
             if (null !== $element->attributes()->id) {
-                $this->assertTrue(\in_array($element->attributes()->id, $elementsId));
+                $this->assertContains((string) $element->attributes()->id, $elementsId);
             }
         }
         libxml_clear_errors();
@@ -137,6 +137,33 @@ public function testHtmlShakespear($css, $count)
         $this->assertCount($count, $elements);
     }
 
+    public function testOnlyOfTypeFindsSingleChildrenOfGivenType()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $document = new \DOMDocument();
+        $document->loadHTML(<<<'HTML'
+<html>
+  <body>
+    <p>
+      <span>A</span>
+    </p>
+    <p>
+      <span>B</span>
+      <span>C</span>
+    </p>
+  </body>
+</html>
+HTML
+);
+
+        $xpath = new \DOMXPath($document);
+        $nodeList = $xpath->query($translator->cssToXPath('span:only-of-type'));
+
+        $this->assertSame(1, $nodeList->length);
+        $this->assertSame('A', $nodeList->item(0)->textContent);
+    }
+
     public function getXpathLiteralTestData()
     {
         return [
@@ -175,7 +202,7 @@ public function getCssToXPathTestData()
             ['e:first-of-type', '*/e[position() = 1]'],
             ['e:last-of-type', '*/e[position() = last()]'],
             ['e:only-child', "*/*[(name() = 'e') and (last() = 1)]"],
-            ['e:only-of-type', 'e[last() = 1]'],
+            ['e:only-of-type', 'e[count(preceding-sibling::e)=0 and count(following-sibling::e)=0]'],
             ['e:empty', 'e[not(*) and not(string-length())]'],
             ['e:EmPTY', 'e[not(*) and not(string-length())]'],
             ['e:root', 'e[not(parent::*)]'],
diff --git a/XPath/Extension/PseudoClassExtension.php b/XPath/Extension/PseudoClassExtension.php
@@ -105,11 +105,13 @@ public function translateOnlyChild(XPathExpr $xpath): XPathExpr
      */
     public function translateOnlyOfType(XPathExpr $xpath): XPathExpr
     {
-        if ('*' === $xpath->getElement()) {
+        $element = $xpath->getElement();
+
+        if ('*' === $element) {
             throw new ExpressionErrorException('"*:only-of-type" is not implemented.');
         }
 
-        return $xpath->addCondition('last() = 1');
+        return $xpath->addCondition(sprintf('count(preceding-sibling::%s)=0 and count(following-sibling::%s)=0', $element, $element));
     }
 
     public function translateEmpty(XPathExpr $xpath): XPathExpr

Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,13 @@ public function translateOnlyChild(XPathExpr $xpath): XPathExpr`
`105`	`105`	`*/`
`106`	`106`	`public function translateOnlyOfType(XPathExpr $xpath): XPathExpr`
`107`	`107`	`{`
`108`		`- if ('*' === $xpath->getElement()) {`
	`108`	`+ $element = $xpath->getElement();`
	`109`	`+`
	`110`	`+ if ('*' === $element) {`
`109`	`111`	`throw new ExpressionErrorException('"*:only-of-type" is not implemented.');`
`110`	`112`	`}`
`111`	`113`
`112`		`- return $xpath->addCondition('last() = 1');`
	`114`	`+ return $xpath->addCondition(sprintf('count(preceding-sibling::%s)=0 and count(following-sibling::%s)=0', $element, $element));`
`113`	`115`	`}`
`114`	`116`
`115`	`117`	`public function translateEmpty(XPathExpr $xpath): XPathExpr`