Improve Converter and Manager

- strtolower apply after Domain validation
- improve Manager Test Suite

Author: nyamsprod

src/Converter.php

@@ -104,7 +104,7 @@ private function addRule(array $list, array $rule_parts): array
         // "The domain and all rules must be canonicalized in the normal way
         // for hostnames - lower-case, Punycode (RFC 3492)."
 
-        $part = $this->idnToAscii(strtolower($part));
+        $part = strtolower($this->idnToAscii($part));
         $isDomain = true;
         if (0 === strpos($part, '!')) {
             $part = substr($part, 1);

src/IDNAConverterTrait.php

@@ -133,7 +133,7 @@ private function setDomain(string $domain = null): array
             throw new Exception(sprintf('The domain `%s` is invalid: this is an IPv4 host', $domain));
         }
 
-        $formatted_domain = strtolower(rawurldecode($domain));
+        $formatted_domain = rawurldecode($domain);
 
         // Note that unreserved is purposely missing . as it is used to separate labels.
         static $domain_name = '/(?(DEFINE)
@@ -144,7 +144,8 @@ private function setDomain(string $domain = null): array
             )
             ^(?:(?&reg_name)\.){0,126}(?&reg_name)\.?$/ix';
         if (preg_match($domain_name, $formatted_domain)) {
-            return [$formatted_domain, array_reverse(explode('.', $formatted_domain))];
+            $domain = strtolower($formatted_domain);
+            return [$domain, array_reverse(explode('.', $domain))];
         }
 
         // a domain name can not contains URI delimiters or space
@@ -162,7 +163,8 @@ private function setDomain(string $domain = null): array
         //if a domain name contains UTF-8 chars it must be convertible using IDNA UTS46
         idn_to_ascii($formatted_domain, 0, INTL_IDNA_VARIANT_UTS46, $arr);
         if (0 === $arr['errors']) {
-            return [$formatted_domain, array_reverse(explode('.', $formatted_domain))];
+            $domain = strtolower($formatted_domain);
+            return [$domain, array_reverse(explode('.', $domain))];
         }
 
         throw new Exception(sprintf('The domain `%s` is invalid : %s', $domain, self::getIdnErrors($arr['errors'])));

src/Manager.php

@@ -98,18 +98,13 @@ private function getCacheKey(string $str): string
      *
      * @param string $source_url the Public Suffix List URL
      *
-     * @throws If the PSL can not be converted to JSON format
-     *
      * @return bool
      */
     public function refreshRules(string $source_url = self::PSL_URL): bool
     {
         $content = $this->http->getContent($source_url);
         $rules = json_encode((new Converter())->convert($content));
-        if (JSON_ERROR_NONE === json_last_error()) {
-            return $this->cache->set($this->getCacheKey($source_url), $rules);
-        }
 
-        throw new Exception('The public suffix list JSON conversion failed: '.json_last_error_msg(), json_last_error());
+        return $this->cache->set($this->getCacheKey($source_url), $rules);
     }
 }

tests/ManagerTest.php

@@ -11,6 +11,7 @@
 use Pdp\Exception;
 use Pdp\Manager;
 use PHPUnit\Framework\TestCase;
+use Psr\SimpleCache\CacheInterface;
 
 /**
  * @coversDefaultClass Pdp\Manager
@@ -75,13 +76,107 @@ public function testRebuildRulesFromRemoveSource()
      * @covers ::refreshRules
      * @covers \Pdp\Converter
      */
-    public function testGetRulesThrowsException()
+    public function testGetRulesThrowsExceptionIfNotCacheCanBeRetrieveOrRefresh()
     {
+        $cachePool = new class() implements CacheInterface {
+            public function get($key, $default = null)
+            {
+                return null;
+            }
+
+            public function set($key, $value, $ttl = null)
+            {
+                return false;
+            }
+
+            public function delete($key)
+            {
+                return true;
+            }
+
+            public function clear()
+            {
+                return true;
+            }
+
+            public function getMultiple($keys, $default = null)
+            {
+                return [];
+            }
+
+            public function setMultiple($values, $ttl = null)
+            {
+                return true;
+            }
+            public function deleteMultiple($keys)
+            {
+                return true;
+            }
+
+            public function has($key)
+            {
+                return true;
+            }
+        };
+
         $this->expectException(Exception::class);
-        $manager = new Manager($this->cachePool, new CurlHttpClient());
+        $manager = new Manager($cachePool, new CurlHttpClient());
         $manager->getRules('https://google.com');
     }
 
+
+    /**
+     * @covers ::__construct
+     * @covers ::getRules
+     */
+    public function testGetRulesThrowsExceptionIfTheCacheIsCorrupted()
+    {
+        $cachePool = new class() implements CacheInterface {
+            public function get($key, $default = null)
+            {
+                return '{"foo":"bar",}'; //malformed json
+            }
+
+            public function set($key, $value, $ttl = null)
+            {
+                return false;
+            }
+
+            public function delete($key)
+            {
+                return true;
+            }
+
+            public function clear()
+            {
+                return true;
+            }
+
+            public function getMultiple($keys, $default = null)
+            {
+                return [];
+            }
+
+            public function setMultiple($values, $ttl = null)
+            {
+                return true;
+            }
+            public function deleteMultiple($keys)
+            {
+                return true;
+            }
+
+            public function has($key)
+            {
+                return true;
+            }
+        };
+
+        $this->expectException(Exception::class);
+        $manager = new Manager($cachePool, new CurlHttpClient());
+        $manager->getRules();
+    }
+
     /**
      * @covers \Pdp\Converter::convert
      * @covers \Pdp\Converter::getSection