remove supports and getSection methods

Author: nyamsprod

CHANGELOG.md

@@ -6,13 +6,10 @@ All Notable changes to `PHP Domain Parser` **5.x** series will be documented in
 
 ### Added
 
-- `Pdp\Rules::supports` returns a boolean to indicates if a given section is supported
 - `Pdp\Rules::getPublicSuffix` returns a `Pdp\PublicSuffix` value object
 - `Pdp\Rules::__set_state` is implemented
-- `Pdp\Domain::getSection` returns a string containing the section name used to determine the public suffix
 - `Pdp\Domain::toUnicode` returns a `Pdp\Domain` with its value converted to its Unicode form
 - `Pdp\Domain::toAscii` returns a `Pdp\Domain` with its value converted to its AScii form
-- `Pdp\PublicSuffix::getSection` returns a string containing the section name used to determine the public suffix
 - `Pdp\PublicSuffix::toUnicode` returns a `Pdp\PublicSuffix` with its value converted to its Unicode form
 - `Pdp\PublicSuffix::toAscii` returns a `Pdp\PublicSuffix` with its value converted to its AScii form
 

README.md

@@ -64,15 +64,13 @@ final class Rules
     public static function createFromPath(string $path, $context = null): self
     public static function createFromString(string $content): self
     public function __construct(array $rules)
-    public function supports(string $section): bool
     public function getPublicSuffix(string $domain = null, string $section = self::ALL_DOMAINS): PublicSuffix
     public function resolve(string $domain = null, string $section = self::ALL_DOMAINS): Domain
 }
 ~~~
 
 **NEW IN VERSION 5.2:**
 
-- `Rules::supports` returns a boolean to tell whether the specific section is present in the `Rules` object;
 - `Rules::getPublicSuffix` returns a `PublicSuffix` object determined from the `Rules` object;
 
 **NEW IN VERSION 5.1:**
@@ -111,17 +109,16 @@ final class Domain implements JsonSerializable
     public function isKnown(): bool;
     public function isICANN(): bool;
     public function isPrivate(): bool;
-    public function getSection(): string;
     public function toUnicode(): self;
     public function toAscii(): self;
 }
 ~~~
 
 **NEW IN VERSION 5.2:**
 
-- `Domain::getSection` returns the section string name if presents else returns an empty string;
 - `Domain::toUnicode` returns an instance with the domain converted to its unicode representation;
 - `Domain::toAscii` returns an instance with the domain converted to its ascii representation;
+- `Domain::getDomain` will lowercase the domain name to normalize its content;
 
 **THIS EXAMPLE ILLUSTRATES HOW THE OBJECT WORK BUT SHOULD BE AVOIDED IN PRODUCTON**
 
@@ -134,7 +131,7 @@ use Pdp\Converter;
 $pdp_url = 'https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat';
 $rules = Rules::createFromPath($pdp_url);
 
-$domain = $rules->resolve('www.ulb.ac.be'); //using Rules::ALL_DOMAINS
+$domain = $rules->resolve('www.Ulb.AC.be'); //using Rules::ALL_DOMAINS
 $domain->getDomain();            //returns 'www.ulb.ac.be'
 $domain->getPublicSuffix();      //returns 'ac.be'
 $domain->getRegistrableDomain(); //returns 'ulb.ac.be'
@@ -156,7 +153,7 @@ echo json_encode($domain, JSON_PRETTY_PRINT);
 
 //The same domain will yield a different result using the PSL PRIVATE DOMAIN SECTION only
 
-$domain = $rules->resolve('www.ulb.ac.be', Rules::PRIVATE_DOMAINS);
+$domain = $rules->resolve('www.Ulb.AC.be', Rules::PRIVATE_DOMAINS);
 echo json_encode($domain, JSON_PRETTY_PRINT);
 // returns
 //  {
@@ -196,16 +193,15 @@ final class PublicSuffix implements Countable, JsonSerializable
     public function isKnown(): bool;
     public function isICANN(): bool;
     public function isPrivate(): bool;
-    public function getSection(): string;
     public function toUnicode(): self;
     public function toAscii(): self;
 }
 ~~~
 
 While `Rules::resolve` will only throws an exception if the section value is invalid, the `Rules::getPublicSuffix` is more restrictive and will additionnally throw if:
 
-- If the Domain is invalid or seriously malformed
-- If the PublicSuffix can not be normalized and converted using the domain encoding.
+- The domain name is invalid or seriously malformed
+- The public suffix can not be normalized and converted using the domain encoding.
 
 **WARNING:**
 
@@ -241,8 +237,9 @@ To work as intended, the `Pdp\Manager` constructor requires:
 
 - a [PSR-16](http://www.php-fig.org/psr/psr-16/) Cache object to store the rules locally.
 
-- a `Pdp\HttpClient` object to retrieve the PSL.  
-the `Pdp\HttpClient` is a simple interface which exposes the `HttpClient::getContent` method. This method expects a string URL representation has its sole argument and returns the body from the given URL resource as a string.  
+- a `Pdp\HttpClient` object to retrieve the PSL.
+
+The `Pdp\HttpClient` is a simple interface which exposes the `HttpClient::getContent` method. This method expects a string URL representation has its sole argument and returns the body from the given URL resource as a string.  
 If an error occurs while retrieving such body a `HttpClientException` exception is thrown.
 
 ~~~php

src/Rules.php

@@ -87,24 +87,6 @@ public function __construct(array $rules)
         $this->rules = $rules;
     }
 
-    /**
-     * Tell whether the submitted section if supported by the current object
-     *
-     * @param string $section
-     *
-     * @return bool
-     */
-    public function supports(string $section): bool
-    {
-        if (self::ALL_DOMAINS === $section) {
-            return true;
-        }
-
-        $rules = $this->rules[$section] ?? null;
-
-        return !(null === $rules || !is_array($rules) || empty($rules));
-    }
-
     /**
      * Determines the public suffix for a given domain.
      *
@@ -174,9 +156,16 @@ private function isMatchable($domain): bool
      */
     private function validateSection(string $section)
     {
-        if (!$this->supports($section)) {
-            throw new Exception(sprintf('%s is an unknown Public Suffix List section', $section));
+        if (self::ALL_DOMAINS === $section) {
+            return;
         }
+
+        $rules = $this->rules[$section] ?? null;
+        if (null !== $rules && is_array($rules)) {
+            return;
+        }
+
+        throw new Exception(sprintf('%s is an unknown Public Suffix List section', $section));
     }
 
     /**