Dropping support for PHP7 and PHP8.0

Author: nyamsprod

.github/workflows/build.yaml

@@ -23,8 +23,4 @@ jobs:
             - run: composer update --no-progress ${{ matrix.composer-flags }}
             - run: composer phpunit
             - run: composer phpstan
-              if: ${{ matrix.php == '8.1' }}
-            - run: composer psalm
-              if: ${{ matrix.php == '8.1' }}
             - run: composer phpcs
-              if: ${{ matrix.php == '8.1' }}

composer.json

@@ -53,11 +53,9 @@
         "phpstan/phpstan-phpunit": "^1.1.1",
         "phpstan/phpstan-strict-rules": "^1.2.3",
         "phpunit/phpunit": "^9.5.20",
-        "psalm/plugin-phpunit": "^0.16.1",
         "psr/http-factory": "^1.0",
         "psr/simple-cache": "^1.0",
-        "symfony/cache": "^v5.0.0 || ^v6.0.0",
-        "vimeo/psalm": "^4.23.0"
+        "symfony/cache": "^v5.0.0 || ^v6.0.0"
     },
     "suggest": {
         "psr/http-client-implementation": "To use the storage functionnality which depends on PSR-18",
@@ -74,20 +72,17 @@
         "phpcs": "php-cs-fixer fix -vvv --diff --dry-run --allow-risky=yes --ansi",
         "phpcs:fix": "php-cs-fixer fix -vvv --allow-risky=yes --ansi",
         "phpstan": "phpstan analyse -l max -c phpstan.neon src --memory-limit=256M --ansi",
-        "psalm": "psalm --show-info=true",
         "phpunit": "XDEBUG_MODE=coverage phpunit --coverage-text",
         "test": [
             "@phpunit",
             "@phpstan",
-            "@psalm",
             "@phpcs"
         ]
     },
     "scripts-descriptions": {
         "phpcs": "Runs coding style test suite",
         "phpcs:fix": "Fix the package coding style",
         "phpstan": "Runs complete codebase static analysis",
-        "psalm": "Runs complete codebase static analysis",
         "phpunit": "Runs unit and functional testing",
         "test": "Runs the complete test suite"
     },

src/Domain.php

@@ -5,7 +5,7 @@
 namespace Pdp;
 
 use Iterator;
-use TypeError;
+use Stringable;
 use function array_count_values;
 use function array_keys;
 use function array_reverse;
@@ -14,13 +14,9 @@
 use function count;
 use function explode;
 use function filter_var;
-use function gettype;
 use function implode;
 use function in_array;
-use function is_object;
-use function is_scalar;
 use function ksort;
-use function method_exists;
 use function preg_match;
 use function rawurldecode;
 use function strtolower;
@@ -44,19 +40,11 @@ final class Domain implements DomainName
 
     private const REGEXP_URI_DELIMITERS = '/[:\/?#\[\]@ ]/';
 
-    /**
-     * @var array<int, string>
-     */
+    /** @var array<int, string> */
     private array $labels;
-
     private ?string $domain;
 
-    private string $type;
-
-    /**
-     * @param null|mixed $domain
-     */
-    private function __construct(string $type, $domain)
+    private function __construct(private string $type, DomainNameProvider|Host|Stringable|string|int|null $domain)
     {
         $this->type = $type;
         $this->domain = $this->parseDomain($domain);
@@ -71,26 +59,17 @@ public static function __set_state(array $properties): self
         return new self($properties['type'], $properties['domain']);
     }
 
-    /**
-     * @param null|mixed $domain
-     */
-    public static function fromIDNA2003($domain): self
+    public static function fromIDNA2003(DomainNameProvider|Host|Stringable|string|int|null $domain): self
     {
         return new self(self::IDNA_2003, $domain);
     }
 
-    /**
-     * @param null|mixed $domain
-     */
-    public static function fromIDNA2008($domain): self
+    public static function fromIDNA2008(DomainNameProvider|Host|Stringable|string|int|null $domain): self
     {
         return new self(self::IDNA_2008, $domain);
     }
 
-    /**
-     * @param mixed $domain a domain
-     */
-    private function parseDomain($domain): ?string
+    private function parseDomain(DomainNameProvider|Host|Stringable|string|int|null $domain): ?string
     {
         if ($domain instanceof DomainNameProvider) {
             $domain = $domain->domain();
@@ -110,25 +89,19 @@ private function parseDomain($domain): ?string
      *
      * For example: parse('wWw.uLb.Ac.be') should return ['www.ulb.ac.be', ['be', 'ac', 'ulb', 'www']];.
      *
-     * @param mixed $domain a domain
-     *
      * @throws SyntaxError If the host is not a domain
      * @throws SyntaxError If the domain is not a host
      */
-    private function parseValue($domain): ?string
+    private function parseValue(Stringable|string|int|null $domain): ?string
     {
         if (null === $domain) {
             return null;
         }
 
-        if (is_object($domain) && method_exists($domain, '__toString')) {
+        if ($domain instanceof Stringable) {
             $domain = (string) $domain;
         }
 
-        if (!is_scalar($domain)) {
-            throw new TypeError('The domain must be a string, a stringable object, a Host object or NULL; `'.gettype($domain).'` given.');
-        }
-
         $domain = (string) $domain;
         if ('' === $domain) {
             return '';
@@ -235,10 +208,6 @@ public function labels(): array
         return $this->labels;
     }
 
-    /**
-     * @psalm-suppress MoreSpecificReturnType
-     * @psalm-suppress LessSpecificReturnStatement
-     */
     public function toAscii(): self
     {
         if (null === $this->domain) {
@@ -253,10 +222,6 @@ public function toAscii(): self
         return new self($this->type, $domain);
     }
 
-    /**
-     * @psalm-suppress MoreSpecificReturnType
-     * @psalm-suppress LessSpecificReturnStatement
-     */
     public function toUnicode(): self
     {
         if (null === $this->domain) {
@@ -273,12 +238,8 @@ public function toUnicode(): self
 
     /**
      * Filter a subdomain to update the domain part.
-     *
-     * @param string|object|null $domain a domain
-     *
-     * @throws TypeError if the domain can not be converted
      */
-    private function normalize($domain): ?string
+    private function normalize(DomainNameProvider|Host|Stringable|string|null $domain): ?string
     {
         if ($domain instanceof DomainNameProvider) {
             $domain = $domain->domain();
@@ -292,33 +253,32 @@ private function normalize($domain): ?string
             return $domain;
         }
 
-        if ((!is_string($domain) && !method_exists($domain, '__toString'))) {
-            throw new TypeError('The label must be a '.Host::class.', a stringable object or a string, `'.gettype($domain).'` given.');
-        }
-
         $domain = (string) $domain;
-        if (null === $this->domain) {
-            return $domain;
-        }
-
-        if (!$this->isAscii()) {
-            return $this->domainToUnicode($domain);
-        }
 
-        return $this->domainToAscii($domain);
+        return match (true) {
+            null === $this->domain => $domain,
+            $this->isAscii() => $this->domainToAscii($domain),
+            default => $this->domainToUnicode($domain),
+        };
     }
 
-    public function prepend($label): self
+    /**
+     * @throws CannotProcessHost
+     */
+    public function prepend(DomainNameProvider|Host|string|Stringable|null $label): self
     {
         return $this->withLabel(count($this->labels), $label);
     }
 
-    public function append($label): self
+    /**
+     * @throws CannotProcessHost
+     */
+    public function append(DomainNameProvider|Host|string|Stringable|null $label): self
     {
         return $this->withLabel(- count($this->labels) - 1, $label);
     }
 
-    public function withLabel(int $key, $label): self
+    public function withLabel(int $key, DomainNameProvider|Host|string|Stringable|null $label): self
     {
         $nbLabels = count($this->labels);
         if ($key < - $nbLabels - 1 || $key > $nbLabels) {

src/DomainName.php

@@ -6,6 +6,7 @@
 
 use Iterator;
 use IteratorAggregate;
+use Stringable;
 
 /**
  * @see https://tools.ietf.org/html/rfc1034#section-3.5
@@ -62,19 +63,15 @@ public function getIterator(): Iterator;
      * Prepends a label to the domain.
      *
      * @see ::withLabel
-     *
-     * @param string|null|object $label a domain label
      */
-    public function prepend($label): self;
+    public function prepend(DomainNameProvider|Host|string|Stringable|null $label): self;
 
     /**
      * Appends a label to the domain.
      *
      * @see ::withLabel
-     *
-     * @param string|null|object $label a domain label
      */
-    public function append($label): self;
+    public function append(DomainNameProvider|Host|string|Stringable|null $label): self;
 
     /**
      * Returns an instance with the specified label added at the specified key.
@@ -85,12 +82,12 @@ public function append($label): self;
      * If $key is non-negative, the added label will be the label at $key position from the start.
      * If $key is negative, the added label will be the label at $key position from the end.
      *
-     * @param string|null|object $label a domain label
+     * @param string|null|Stringable|Host|DomainNameProvider $label a domain label
      *
      * @throws CannotProcessHost If the key is out of bounds
      * @throws CannotProcessHost If the label is converted to the NULL value
      */
-    public function withLabel(int $key, $label): self;
+    public function withLabel(int $key, DomainNameProvider|Host|string|Stringable|null $label): self;
 
     /**
      * Returns an instance with the label at the specified key removed.

src/DomainTest.php

@@ -315,7 +315,7 @@ public function withLabelWorksProvider(): iterable
     public function testWithLabelFailsWithTypeError(): void
     {
         $this->expectException(TypeError::class);
-        Domain::fromIDNA2008('example.com')->withLabel(1, new stdClass());
+        Domain::fromIDNA2008('example.com')->withLabel(1, new stdClass()); /* @phpstan-ignore-line */
     }
 
     public function testWithLabelFailsWithInvalidKey(): void

src/IdnaInfo.php

@@ -31,22 +31,14 @@ final class IdnaInfo
         Idna::ERROR_CONTEXTO_PUNCTUATION => 'a label does not meet the IDNA CONTEXTO requirements for punctuation characters. Some punctuation characters "Would otherwise have been DISALLOWED" but are allowed in certain contexts',
     ];
 
-    private string $result;
-
-    private bool $isTransitionalDifferent;
-
-    private int $errors;
-
-    /**
-     * @var array<int, string>
-     */
-    private array $errorList;
-
-    private function __construct(string $result, bool $isTransitionalDifferent, int $errors)
-    {
-        $this->result = $result;
-        $this->errors = $errors;
-        $this->isTransitionalDifferent = $isTransitionalDifferent;
+    /** @var array<int, string> */
+    public readonly array $errorList;
+
+    private function __construct(
+        public readonly string $result,
+        public readonly bool $isTransitionalDifferent,
+        public readonly int $errors
+    ) {
         $this->errorList = array_filter(
             self::ERRORS,
             fn (int $error): bool => 0 !== ($error & $this->errors),

src/IdnaInfoTest.php

@@ -24,11 +24,11 @@ public function testItCanBeInstantiatedFromArray(): void
         $infos = ['result' => '', 'isTransitionalDifferent' => false, 'errors' => 0];
         $result = IdnaInfo::fromIntl($infos);
 
-        self::assertSame('', $result->result());
-        self::assertFalse($result->isTransitionalDifferent());
-        self::assertSame(0, $result->errors());
+        self::assertSame('', $result->result);
+        self::assertFalse($result->isTransitionalDifferent);
+        self::assertSame(0, $result->errors);
         self::assertNull($result->error(Idna::ERROR_BIDI));
-        self::assertCount(0, $result->errorList());
+        self::assertCount(0, $result->errorList);
     }
 
     public function testInvalidSyntaxAfterIDNConversion(): void
@@ -38,9 +38,9 @@ public function testInvalidSyntaxAfterIDNConversion(): void
         } catch (SyntaxError $exception) {
             $result = $exception->idnaInfo();
             self::assertInstanceOf(IdnaInfo::class, $result);
-            self::assertSame(Idna::ERROR_DISALLOWED, $result->errors());
+            self::assertSame(Idna::ERROR_DISALLOWED, $result->errors);
             self::assertIsString($result->error(Idna::ERROR_DISALLOWED));
-            self::assertCount(1, $result->errorList());
+            self::assertCount(1, $result->errorList);
         }
     }
 }