feature #35425 [CssSelector] Added cache on top of CssSelectorConverter (lyrixx)

fabpot · fabpot · commit 1cfadb41dc7c · 2020-01-27T16:43:33.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [CssSelector] Added cache on top of CssSelectorConverter | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- ed11d52 [CssSelector] Added cache on top of CssSelectorConverter
diff --git a/src/Symfony/Component/CssSelector/CssSelectorConverter.php b/src/Symfony/Component/CssSelector/CssSelectorConverter.php
@@ -27,6 +27,10 @@
 class CssSelectorConverter
 {
     private $translator;
+    private $cache;
+
+    private static $xmlCache = [];
+    private static $htmlCache = [];
 
     /**
      * @param bool $html Whether HTML support should be enabled. Disable it for XML documents
@@ -37,6 +41,9 @@ public function __construct(bool $html = true)
 
         if ($html) {
             $this->translator->registerExtension(new HtmlExtension($this->translator));
+            $this->cache = &self::$htmlCache;
+        } else {
+            $this->cache = &self::$xmlCache;
         }
 
         $this->translator
@@ -57,6 +64,6 @@ public function __construct(bool $html = true)
      */
     public function toXPath(string $cssExpr, string $prefix = 'descendant-or-self::')
     {
-        return $this->translator->cssToXPath($cssExpr, $prefix);
+        return $this->cache[$prefix][$cssExpr] ?? $this->cache[$prefix][$cssExpr] = $this->translator->cssToXPath($cssExpr, $prefix);
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Tests/CssSelectorConverterTest.php b/src/Symfony/Component/CssSelector/Tests/CssSelectorConverterTest.php
@@ -26,13 +26,21 @@ public function testCssToXPath()
         $this->assertEquals("descendant-or-self::h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]", $converter->toXPath('h1.foo'));
         $this->assertEquals('descendant-or-self::foo:h1', $converter->toXPath('foo|h1'));
         $this->assertEquals('descendant-or-self::h1', $converter->toXPath('H1'));
+
+        // Test the cache layer
+        $converter = new CssSelectorConverter();
+        $this->assertEquals('descendant-or-self::h1', $converter->toXPath('H1'));
     }
 
     public function testCssToXPathXml()
     {
         $converter = new CssSelectorConverter(false);
 
         $this->assertEquals('descendant-or-self::H1', $converter->toXPath('H1'));
+
+        $converter = new CssSelectorConverter(false);
+        // Test the cache layer
+        $this->assertEquals('descendant-or-self::H1', $converter->toXPath('H1'));
     }
 
     public function testParseExceptions()
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.1.0
+-----
+
+* Added an internal cache layer on top of the CssSelectorConverter
+
 5.0.0
 -----
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@`
`27`	`27`	`class CssSelectorConverter`
`28`	`28`	`{`
`29`	`29`	`private $translator;`
	`30`	`+ private $cache;`
	`31`	`+`
	`32`	`+ private static $xmlCache = [];`
	`33`	`+ private static $htmlCache = [];`
`30`	`34`
`31`	`35`	`/**`
`32`	`36`	`* @param bool $html Whether HTML support should be enabled. Disable it for XML documents`
`@@ -37,6 +41,9 @@ public function __construct(bool $html = true)`
`37`	`41`
`38`	`42`	`if ($html) {`
`39`	`43`	`$this->translator->registerExtension(new HtmlExtension($this->translator));`
	`44`	`+ $this->cache = &self::$htmlCache;`
	`45`	`+ } else {`
	`46`	`+ $this->cache = &self::$xmlCache;`
`40`	`47`	`}`
`41`	`48`
`42`	`49`	`$this->translator`
`@@ -57,6 +64,6 @@ public function __construct(bool $html = true)`
`57`	`64`	`*/`
`58`	`65`	`public function toXPath(string $cssExpr, string $prefix = 'descendant-or-self::')`
`59`	`66`	`{`
`60`		`- return $this->translator->cssToXPath($cssExpr, $prefix);`
	`67`	`+ return $this->cache[$prefix][$cssExpr] ?? $this->cache[$prefix][$cssExpr] = $this->translator->cssToXPath($cssExpr, $prefix);`
`61`	`68`	`}`
`62`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,21 @@ public function testCssToXPath()`
`26`	`26`	`$this->assertEquals("descendant-or-self::h1[@class and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]", $converter->toXPath('h1.foo'));`
`27`	`27`	`$this->assertEquals('descendant-or-self::foo:h1', $converter->toXPath('foo\|h1'));`
`28`	`28`	`$this->assertEquals('descendant-or-self::h1', $converter->toXPath('H1'));`
	`29`	`+`
	`30`	`+ // Test the cache layer`
	`31`	`+ $converter = new CssSelectorConverter();`
	`32`	`+ $this->assertEquals('descendant-or-self::h1', $converter->toXPath('H1'));`
`29`	`33`	`}`
`30`	`34`
`31`	`35`	`public function testCssToXPathXml()`
`32`	`36`	`{`
`33`	`37`	`$converter = new CssSelectorConverter(false);`
`34`	`38`
`35`	`39`	`$this->assertEquals('descendant-or-self::H1', $converter->toXPath('H1'));`
	`40`	`+`
	`41`	`+ $converter = new CssSelectorConverter(false);`
	`42`	`+ // Test the cache layer`
	`43`	`+ $this->assertEquals('descendant-or-self::H1', $converter->toXPath('H1'));`
`36`	`44`	`}`
`37`	`45`
`38`	`46`	`public function testParseExceptions()`