Merge pull request #10 from mambax7/feature/PHP8.2

mambax7 · web-flow · commit 4b6313e34e5a · 2026-02-23T00:49:08.000-05:00
Feature/php8.2
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -14,7 +14,6 @@ src/                          # Library source code
     PslCacheNotFoundException.php  # Thrown when no valid PSL cache is found
 bin/
   update-psl.php              # Downloads and caches the Mozilla PSL (atomic writes, HTTP conditional)
-  reloadpsl                   # Shell wrapper to force PSL reload
 data/
   psl.cache.php               # Bundled PSL cache (PHP array with NORMAL/WILDCARD/EXCEPTION keys)
   psl.meta.json               # HTTP metadata (ETag, Last-Modified) for conditional downloads
@@ -39,7 +38,7 @@ composer update-psl           # Download fresh Mozilla Public Suffix List
 
 ## PHP Compatibility
 
-Code must run on PHP 7.4 through 8.5. Do not use features exclusive to PHP 8.0+ (named arguments, match expressions, union type hints in signatures, enums, fibers, readonly properties, intersection types, `never` return type, first-class callable syntax).
+Code must run on PHP 8.2 through 8.5. PHP 8.2+ language features are available: union types, named arguments, `match` expressions, enums, `readonly`, constructor promotion, intersection types, `never` return type, first-class callable syntax, and `#[Attribute]` syntax.
 
 ## Key Architecture
 
@@ -97,7 +96,7 @@ XOOPS has two major generations with different APIs. Code must support both:
 
 1. Code follows PSR-12 and passes `composer lint`.
 2. Static analysis passes `composer analyse` with no new errors.
-3. Tests pass on all supported PHP versions (7.4-8.5).
+3. Tests pass on all supported PHP versions (8.2-8.5).
 4. New public methods have PHPDoc with `@param`, `@return`, and `@throws` tags.
 5. New functionality has corresponding unit tests.
 6. Changes are documented in the changelog.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,12 +14,9 @@ jobs:
       matrix:
         include:
           # Lowest supported dependencies test
-          - php: "7.4"
+          - php: "8.2"
             deps: "lowest"
           # Standard tests across all supported versions
-          - php: "7.4"
-          - php: "8.0"
-          - php: "8.1"
           - php: "8.2"
           - php: "8.3"
           - php: "8.4"
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,4 +1,6 @@
 build:
+  environment:
+    php: 8.2
   nodes:
     analysis:
       tests:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,14 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
-## [2.0.2-beta3] - 2026-02-08
+## [2.1.0-beta1] - 2026-02-22
+
+### Breaking Changes
+
+* Require PHP 8.2 as minimum version (was PHP 7.4); remove `symfony/polyfill-php80` and `symfony/polyfill-mbstring` polyfill dependencies
+* Require `ext-mbstring` as a hard dependency (was provided by polyfill)
+* Remove `bin/reloadpsl` convenience script entirely — invoke `bin/update-psl.php` directly instead
+* Require PHPUnit `^11.0` only (was `^9.6 || ^10.0 || ^11.0`)
 
 ### Bug Fixes
 * Fix `getPublicSuffix()` PSL exception-rule handling — exception branch returned one label too many; now correctly returns the exception rule minus its leftmost label (e.g. `!city.kawasaki.jp` yields public suffix `kawasaki.jp`, not `city.kawasaki.jp`)
@@ -13,7 +20,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 * Fix `normalizeDomain()` crash on empty string — `idn_to_ascii('')` throws `ValueError` on PHP 8.4+; added `$domain !== ''` guard
 * Fix PSL exception tests referencing `parliament.uk` (removed from the PSL); replaced with stable entries (`www.ck`, `city.kawasaki.jp`)
 * Fix `bin/update-psl.php` failing when run standalone on PHP 7.4 — `str_starts_with()` was called without loading the polyfill autoloader
-* Fix `bin/reloadpsl` calling removed methods (`clearDataDirectory()`, `getTree()`); rewritten as a simple wrapper
 * Fix `getMetadata()` unreachable statement
 
 ### Security
@@ -24,13 +30,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ### Changed
 * Make `normalizeDomain()` a `private static` method (was instance method)
-* Replace `strpos()`/`substr()` patterns with `str_contains()`/`str_starts_with()`/`str_ends_with()` via `symfony/polyfill-php80`
+* Replace `strpos()`/`substr()` patterns with `str_contains()`/`str_starts_with()`/`str_ends_with()` (native in PHP 8.0)
 * Add `@throws PslCacheNotFoundException` PHPDoc tags to `PublicSuffixList::__construct()` and `loadRules()`
 * Add XOOPS copyright headers to all source files
 * Clarify `README.md` license section — library code is Apache-2.0, bundled PSL data is MPL-2.0
 
 ### Added
-* Add `symfony/polyfill-php80` dependency for `str_contains`, `str_starts_with`, `str_ends_with` on PHP 7.4
 * Add `ext-intl` to `suggest` in `composer.json`
 
 ### Tests
@@ -49,14 +54,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 * Add Composer autoloader bootstrap to `bin/update-psl.php` for standalone execution
 * Add `composer ci` script chaining lint + analyse + test
 * Add `composer update-psl` and `auto-update-psl` scripts with `XOOPS_SKIP_PSL_UPDATE` support
-* Add GitHub Actions CI workflow — PHP 7.4–8.5 matrix, lowest-deps on 7.4, coverage on 8.3
+* Update GitHub Actions CI matrix from PHP 7.4–8.5 to PHP 8.2–8.5; lowest-deps on 8.2, coverage on 8.3
 * Fix CI coverage matrix entry running tests twice — added `if: !matrix.coverage` guard
 * Fix SonarCloud workflow using `secrets` context in step-level `if:` — moved to job-level `env`
 * Add GitHub Copilot custom instructions (`.github/copilot-instructions.md`)
 * Add Dependabot configuration for Composer and GitHub Actions
 * Add Qodana static analysis workflow
 * Add `.editorconfig` (UTF-8, LF, PSR-12 indentation)
-* Remove `xsi:noNamespaceSchemaLocation` from `phpunit.xml.dist` to avoid XSD validation warnings on PHPUnit 9; `<source>` element works natively on PHPUnit 10+/11+
+* Convert test `@dataProvider` annotations to PHPUnit 11 `#[DataProvider]` attributes
+* Convert test `@requires` annotations to `#[RequiresPhpExtension]` attributes
+* Add PHPUnit 11 XSD schema and `cacheDirectory` to `phpunit.xml.dist`
 * Standardize `.gitattributes` with LF enforcement and export-ignore list
 * Standardize `.gitignore` with local config overrides, build artifacts, PHPUnit cache
 * Track `phpcs.xml` in version control (was previously untracked, causing CI lint failure)
@@ -173,7 +180,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 * Import Florian Sager's regdom-php library (Synchro/Marcus Bointon)
 * PHP include file for domain registration data (Synchro/Marcus Bointon)
 
-[2.0.2-beta3]: https://github.com/XOOPS/RegDom/compare/v2.0.2-beta2...HEAD
+[2.1.0-beta1]: https://github.com/XOOPS/RegDom/compare/v2.0.2-beta2...HEAD
 [2.0.2-beta2]: https://github.com/XOOPS/RegDom/compare/v2.0.2-beta1...v2.0.2-beta2
 [2.0.2-beta1]: https://github.com/XOOPS/RegDom/compare/v2.0.1...v2.0.2-beta1
 [2.0.1]: https://github.com/XOOPS/RegDom/compare/v2.0.0...v2.0.1
diff --git a/README.md b/README.md
@@ -10,7 +10,8 @@ For more information on public suffixes, see [publicsuffix.org](https://publicsu
 
 ## Requirements
 
-- PHP 7.4 or later
+- PHP 8.2 or later
+- `ext-mbstring` required
 - `ext-intl` recommended (for internationalized domain name support)
 
 ## Installation
diff --git a/bin/reloadpsl b/bin/reloadpsl
diff --git a/bin/update-psl.php b/bin/update-psl.php
@@ -13,7 +13,7 @@
  * @source  https://publicsuffix.org/
  */
 
-// Load Composer autoloader (provides polyfills for PHP 7.4)
+// Load Composer autoloader
 foreach ([__DIR__ . '/../vendor/autoload.php', __DIR__ . '/../../../autoload.php'] as $autoload) {
     if (file_exists($autoload)) {
         require_once $autoload;
diff --git a/composer.json b/composer.json
@@ -29,13 +29,12 @@
     }
   ],
   "require": {
-    "php": "^7.4 || ^8.0",
-    "symfony/polyfill-mbstring": "^1.33",
-    "symfony/polyfill-php80": "^1.33"
+    "php": "^8.2",
+    "ext-mbstring": "*"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.10 || ^2.0",
-    "phpunit/phpunit": "^9.6 || ^10.0 || ^11.0",
+    "phpunit/phpunit": "^11.0",
     "roave/security-advisories": "dev-latest",
     "squizlabs/php_codesniffer": "^3.11"
   },
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -13,7 +13,6 @@ src/
     PslCacheNotFoundException.php  Thrown when no valid cache is found
 bin/
   update-psl.php                  Downloads PSL from publicsuffix.org, builds cache
-  reloadpsl                       Convenience wrapper for update-psl.php
 data/
   psl.cache.php                   Bundled PSL cache (PHP array, ~200 KB)
   psl.meta.json                   Download metadata (ETag, Last-Modified)
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Uses <source> (PHPUnit 10.1+) for code-coverage source filtering.
-  PHPUnit 9.6 (PHP 7.4/8.0) ignores this element harmlessly; coverage is only
-  collected on PHP 8.3 (PHPUnit 10+) in CI, so the filter is always effective
-  when it matters.
-
-  The xsi:noNamespaceSchemaLocation attribute is intentionally omitted to avoid
-  XSD validation warnings on PHPUnit 9, which does not recognise <source>.
--->
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          colors="true"
+         cacheDirectory=".phpunit.cache"
          failOnRisky="true"
          failOnWarning="true">
     <testsuites>
diff --git a/tests/integration/IntegrationTest.php b/tests/integration/IntegrationTest.php
@@ -2,13 +2,13 @@
 
 namespace Xoops\RegDom\Tests\Integration;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use Xoops\RegDom\PublicSuffixList;
 use Xoops\RegDom\RegisteredDomain;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @requires extension intl
- */
+#[RequiresPhpExtension('intl')]
 class IntegrationTest extends TestCase
 {
     private RegisteredDomain $regdom;
@@ -23,9 +23,7 @@ protected function setUp(): void
         $this->regdom = new RegisteredDomain(new PublicSuffixList());
     }
 
-    /**
-     * @dataProvider realWorldDataProvider
-     */
+    #[DataProvider('realWorldDataProvider')]
     public function testGetRegisteredDomainWithRealPsl(string $host, ?string $expected): void
     {
         $this->assertSame($expected, $this->regdom->getRegisteredDomain($host));
diff --git a/tests/integration/PublicSuffixListIntegrationTest.php b/tests/integration/PublicSuffixListIntegrationTest.php
@@ -2,6 +2,7 @@
 
 namespace Xoops\RegDom\Tests\Integration;
 
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use Xoops\RegDom\PublicSuffixList;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
@@ -28,7 +29,6 @@ protected function tearDown(): void
     {
         // Reset static PSL cache to prevent cross-test leakage
         $ref = new ReflectionProperty(PublicSuffixList::class, 'rules');
-        $ref->setAccessible(true);
         $ref->setValue(null, null);
     }
 
@@ -90,9 +90,7 @@ public function testIsPublicSuffixWithPunycodeDomains(): void
         $this->assertTrue($this->psl->isPublicSuffix('xn--55qx5d.cn'));     // 公司.cn in punycode
     }
 
-    /**
-     * @requires extension intl
-     */
+    #[RequiresPhpExtension('intl')]
     public function testIsPublicSuffixWithUnicodeIdnDomains(): void
     {
         // Unicode input requires ext-intl for idn_to_ascii() conversion
@@ -106,9 +104,7 @@ public function testGetPublicSuffixWithPunycodeDomains(): void
         $this->assertSame('xn--55qx5d.cn', $this->psl->getPublicSuffix('test.xn--55qx5d.cn'));
     }
 
-    /**
-     * @requires extension intl
-     */
+    #[RequiresPhpExtension('intl')]
     public function testGetPublicSuffixWithUnicodeIdnDomains(): void
     {
         // Unicode input requires ext-intl for idn_to_ascii() conversion
diff --git a/tests/unit/PublicSuffixListTest.php b/tests/unit/PublicSuffixListTest.php
@@ -26,7 +26,6 @@ protected function tearDown(): void
     {
         // Reset static PSL cache to prevent cross-test leakage
         $ref = new ReflectionProperty(PublicSuffixList::class, 'rules');
-        $ref->setAccessible(true);
         $ref->setValue(null, null);
     }
 
diff --git a/tests/unit/RegisteredDomainTest.php b/tests/unit/RegisteredDomainTest.php
@@ -2,6 +2,7 @@
 
 namespace Xoops\RegDom\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Xoops\RegDom\PublicSuffixList;
 use Xoops\RegDom\RegisteredDomain;
 use PHPUnit\Framework\TestCase;
@@ -26,9 +27,7 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
-    /**
-     * @dataProvider getRegisteredDomainProvider
-     */
+    #[DataProvider('getRegisteredDomainProvider')]
     public function testGetRegisteredDomain(string $host, ?string $expected): void
     {
         $this->pslMock->method('getPublicSuffix')->willReturnCallback(function (string $h) {
@@ -72,9 +71,7 @@ public function testGetRegisteredDomain(string $host, ?string $expected): void
         $this->assertSame($expected, $regdom->getRegisteredDomain($host));
     }
 
-    /**
-     * @dataProvider domainMatchesProvider
-     */
+    #[DataProvider('domainMatchesProvider')]
     public function testDomainMatches(string $host, string $domain, bool $expected): void
     {
         $this->pslMock->method('isPublicSuffix')->willReturnCallback(
