Improve code readability

Author: nyamsprod

data/pdp-PSL_FULL_5a3cc7f81795bb2e48e848af42d287b4.cache

@@ -116,8 +116,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)."
         try {
-            $tld = array_pop($rule_parts);
-            $rule = $this->idnToAscii($tld);
+            $rule = $this->idnToAscii(array_pop($rule_parts));
         } catch (Exception $e) {
             throw new CouldNotLoadRules($e->getMessage(), $e->getCode(), $e);
         }

data/pdp-RZD_FULL_f18a70477d29d525b9220612e2115345.cache

@@ -90,7 +90,7 @@ public function getRules(string $url = self::PSL_URL, $ttl = null): Rules
             return new Rules($data);
         }
 
-        throw new CouldNotLoadRules('The public suffix list cache is corrupted: '.json_last_error_msg(), json_last_error());
+        throw new CouldNotLoadRules(sprintf('The public suffix list cache is corrupted: %s', json_last_error_msg()), json_last_error());
     }
 
     /**
@@ -110,12 +110,9 @@ public function refreshRules(string $url = self::PSL_URL, $ttl = null): bool
         static $converter;
 
         $converter = $converter ?? new Converter();
+        $data = json_encode($converter->convert($this->http->getContent($url)));
 
-        return $this->cache->set(
-            $this->getCacheKey('PSL', $url),
-            json_encode($converter->convert($this->http->getContent($url))),
-            $this->filterTtl($ttl) ?? $this->ttl
-        );
+        return $this->cache->set($this->getCacheKey('PSL', $url), $data, $this->filterTtl($ttl) ?? $this->ttl);
     }
 
     /**
@@ -139,11 +136,11 @@ public function getTLDs(string $url = self::RZD_URL, $ttl = null): TopLevelDomai
 
         $data = json_decode($data ?? $this->cache->get($key), true);
         if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new CouldNotLoadTLDs('The root zone database cache is corrupted: '.json_last_error_msg(), json_last_error());
+            throw new CouldNotLoadTLDs(sprintf('The root zone database cache is corrupted: %s', json_last_error_msg()), json_last_error());
         }
 
         if (!isset($data['records'], $data['version'], $data['modifiedDate'])) {
-            throw new CouldNotLoadTLDs(sprintf('The root zone database cache content is corrupted'));
+            throw new CouldNotLoadTLDs('The root zone database cache content is corrupted');
         }
 
         return new TopLevelDomains(
@@ -170,12 +167,9 @@ public function refreshTLDs(string $url = self::RZD_URL, $ttl = null): bool
         static $converter;
 
         $converter = $converter ?? new TLDConverter();
+        $data = json_encode($converter->convert($this->http->getContent($url)));
 
-        return $this->cache->set(
-            $this->getCacheKey('RZD', $url),
-            json_encode($converter->convert($this->http->getContent($url))),
-            $this->filterTtl($ttl) ?? $this->ttl
-        );
+        return $this->cache->set($this->getCacheKey('RZD', $url), $data, $this->filterTtl($ttl) ?? $this->ttl);
     }
 
     /**

src/Converter.php

@@ -225,13 +225,15 @@ public function resolve($domain): Domain
             return $domain;
         }
 
+        $publicSuffix = null;
         $label = $domain->toAscii()->getLabel(0);
         foreach ($this as $tld) {
             if ($tld->getContent() === $label) {
-                return $domain->resolve($tld);
+                $publicSuffix = $tld;
+                break;
             }
         }
 
-        return $domain->resolve(null);
+        return $domain->resolve($publicSuffix);
     }
 }