improve Domain::withPublicSuffix

Author: nyamsprod

src/Domain.php

@@ -380,7 +380,7 @@ public function withPublicSuffix(PublicSuffix $publicSuffix): self
         }
 
         $publicSuffixContent = $publicSuffix->getContent();
-        if ($this->domain === $publicSuffixContent || $publicSuffixContent !== substr($this->domain, - strlen($publicSuffixContent))) {
+        if ($this->domain === $publicSuffixContent || '.'.$publicSuffixContent !== substr($this->domain, - strlen($publicSuffixContent) - 1)) {
             throw new Exception(sprintf('the public suffix `%s` can not be assign to the domain name `%s`', $publicSuffixContent, $this->domain));
         }
 

src/Manager.php

@@ -61,13 +61,13 @@ public function __construct(CacheInterface $cache, HttpClient $http)
     public function getRules(string $source_url = self::PSL_URL): Rules
     {
         $cacheKey = $this->getCacheKey($source_url);
-        $rules = $this->cache->get($cacheKey);
+        $cacheRules = $this->cache->get($cacheKey);
 
-        if (null === $rules && !$this->refreshRules($source_url)) {
+        if (null === $cacheRules && !$this->refreshRules($source_url)) {
             throw new Exception(sprintf('Unable to load the public suffix list rules for %s', $source_url));
         }
 
-        $rules = json_decode($rules ?? $this->cache->get($cacheKey), true);
+        $rules = json_decode($cacheRules ?? $this->cache->get($cacheKey), true);
         if (JSON_ERROR_NONE === json_last_error()) {
             return new Rules($rules);
         }
@@ -102,9 +102,13 @@ private function getCacheKey(string $str): string
      */
     public function refreshRules(string $source_url = self::PSL_URL): bool
     {
-        $content = $this->http->getContent($source_url);
-        $rules = json_encode((new Converter())->convert($content));
+        static $converter;
 
-        return $this->cache->set($this->getCacheKey($source_url), $rules);
+        $converter = $converter ?? new Converter();
+
+        return $this->cache->set(
+            $this->getCacheKey($source_url),
+            json_encode($converter->convert($this->http->getContent($source_url)))
+        );
     }
 }

src/Rules.php

@@ -64,7 +64,11 @@ public static function createFromPath(string $path, $context = null): self
      */
     public static function createFromString(string $content): self
     {
-        return new self((new Converter())->convert($content));
+        static $converter;
+
+        $converter = $converter ?? new Converter();
+
+        return new self($converter->convert($content));
     }
 
     /**

tests/DomainTest.php

@@ -410,6 +410,10 @@ public function withPublicSuffixFailsProvider()
                 'domain' => new Domain('ac.be'),
                 'public suffix' => $publicSuffix,
             ],
+            'partial public suffix' => [
+                'domain' => $domain,
+                'public suffix' => new PublicSuffix('c.be'),
+            ],
         ];
     }