Catchup with upstream

.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
           interval: "daily"
       commit-message:
           prefix: "[Dependabot] "
-      milestone: 10
+      milestone: 12
 
     - package-ecosystem: "composer"
       directory: "/"
@@ -26,4 +26,4 @@ updates:
       versioning-strategy: "increase"
       commit-message:
           prefix: "[Dependabot] "
-      milestone: 10
+      milestone: 12

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -34,7 +34,7 @@ jobs:
               run: composer config --global --list
 
             - name: Cache dependencies installed with composer
-              uses: actions/cache@v4
+              uses: actions/cache@v5
               with:
                   path: ~/.cache/composer
                   key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -47,7 +47,7 @@ jobs:
                   composer show;
 
             - name: PHP Lint
-              run: composer ci:php:lint
+              run: composer check:php:lint
 
     unit-tests:
         name: Unit tests
@@ -63,7 +63,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -77,7 +77,7 @@ jobs:
               run: composer config --global --list
 
             - name: Cache dependencies installed with composer
-              uses: actions/cache@v4
+              uses: actions/cache@v5
               with:
                   path: ~/.cache/composer
                   key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -105,14 +105,15 @@ jobs:
                 command:
                     - composer:normalize
                     - php:fixer
+                    - php:codesniffer
                     - php:stan
                     - php:rector
                 php-version:
                     - '8.3'
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -126,7 +127,7 @@ jobs:
               run: composer config --global --list
 
             - name: Cache dependencies installed with composer
-              uses: actions/cache@v4
+              uses: actions/cache@v5
               with:
                   path: ~/.cache/composer
                   key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -145,4 +146,4 @@ jobs:
                   phive --no-progress install --trust-gpg-keys 0FDE18AE1D09E19F60F6B1CBC00543248C87FB13,BBAB5DF0A0D6672989CF1869E82B2FB314E9906E
 
             - name: Run Command
-              run: composer ci:${{ matrix.command }}
+              run: composer check:${{ matrix.command }}

.github/workflows/codecoverage.yml

@@ -22,7 +22,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
@@ -39,7 +39,7 @@ jobs:
               run: composer config --global --list
 
             - name: Cache dependencies installed with composer
-              uses: actions/cache@v4
+              uses: actions/cache@v5
               with:
                   path: ~/.cache/composer
                   key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -52,13 +52,15 @@ jobs:
                   composer show;
 
             - name: Run Tests
-              run: composer ci:tests:coverage
+              run: composer check:tests:coverage
 
             - name: Show generated coverage files
               run: ls -lah
 
             - name: Upload coverage results to Coveralls
               uses: coverallsapp/github-action@v2
+              with:
+                  fail-on-error: false
               env:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   file: coverage.xml

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="composer-normalize" version="^2.44.0" installed="2.48.2" location="./.phive/composer-normalize" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.59.3" installed="3.87.2" location="./.phive/php-cs-fixer" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.59.3" installed="3.89.2" location="./.phive/php-cs-fixer" copy="false"/>
 </phive>

CHANGELOG.md

@@ -18,10 +18,73 @@ Please also have a look at our
 
 ### Fixed
 
-- Use typesafe versions of PHP functions (#1379, #1380, #1382, #1383, #1384)
+### Documentation
+
+## 9.3.0: Support for modern CSS at-rules and autoloading bugfix
+
+### Added
+
+- Add support for modern CSS at-rules: `@layer`, `@scope`, and `@starting-style` (#1549)
+
+### Fixed
+
+- Avoid double autoloading of class aliases (#1552)
 
 ### Documentation
 
+## 9.2.0: New features and deprecations
+
+### Added
+
+- Add `OutputFormat::setSpaceAroundSelectorCombinator()` (#1504)
+- Add support for escaped quotes in the selectors (#1485, #1489)
+- Provide line number in exception message for mismatched parentheses in
+  selector (#1435)
+- Add support for CSS container queries (#1400)
+
+### Changed
+
+- `RuleSet\RuleContainer` is renamed to `RuleSet\DeclarationList` (#1530, #1539)
+- Methods like `setRule()` in `RuleSet` and `DeclarationBlock` have been renamed
+  to `setDeclaration()`, etc. (#1521)
+- `Rule\Rule` class is renamed to `Property\Declaration`
+  (#1508, #1512, #1513, #1522)
+- `Rule::setRule()` and `getRule()` are replaced with `setPropertyName()` and
+  `getPropertyName()` (#1506)
+- `Selector` is now represented as a sequence of `Selector\Component` objects
+  which can be accessed via `getComponents()`, manipulated individually, or set
+  via `setComponents()` (#1478, #1486, #1487, #1488, #1494, #1496, #1536, #1537)
+- `Selector::setSelector()` and `Selector` constructor will now throw exception
+  upon provision of an invalid selectior (#1498, #1502)
+- Clean up extra whitespace in CSS selector (#1398)
+- The array keys passed to `DeclarationBlock::setSelectors()` are no longer
+  preserved (#1407)
+
+### Deprecated
+
+- `RuleSet\RuleContainer` is deprecated; use `RuleSet\DeclarationList` instead
+  (#1530)
+- Methods like `setRule()` in `RuleSet` and `DeclarationBlock` are deprecated;
+  there are direct replacements such as `setDeclaration()` (#1521)
+- `Rule\Rule` class is deprecated; `Property\Declaration` is a direct
+  replacement (#1508)
+- `Rule::setRule()` and `getRule()` are deprecated and replaced with
+  `setPropertyName()` and `getPropertyName()` (#1506, #1519)
+
+### Fixed
+
+- Do not escape characters that do not need escaping in CSS string (#1444)
+- Reject selector comprising only whitespace (#1433)
+- Improve recovery parsing when a rogue `}` is encountered (#1425, #1426)
+- Parse comment(s) immediately preceding a selector (#1421, #1424)
+- Parse consecutive comments (#1421)
+- Support attribute selectors with values containing commas in
+  `DeclarationBlock::setSelectors()` (#1419)
+- Allow `removeDeclarationBlockBySelector()` to be order-insensitve (#1406)
+- Fix parsing of `calc` expressions when a newline immediately precedes or
+  follows a `+` or `-` operator (#1399)
+- Use typesafe versions of PHP functions (#1379, #1380, #1382, #1383, #1384)
+
 ## 9.1.0: Add support for PHP 8.5
 
 ### Added

CONTRIBUTING.md

@@ -80,7 +80,7 @@ code coverage of the fixed bugs and the new features.
 To run the existing PHPUnit tests, run this command:
 
 ```bash
-composer ci:tests:unit
+composer check:tests:unit
 ```
 
 ## Coding Style
@@ -94,7 +94,7 @@ We will only merge pull requests that follow the project's coding style.
 Please check your code with the provided static code analysis tools:
 
 ```bash
-composer ci:static
+composer check:static
 ```
 
 Please make your code clean, well-readable and easy to understand.

composer.json

@@ -25,18 +25,19 @@
     "require": {
         "php": "^7.2.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-iconv": "*",
-        "thecodingmachine/safe": "^1.3 || ^2.5 || ^3.3"
+        "thecodingmachine/safe": "^1.3 || ^2.5 || ^3.4"
     },
     "require-dev": {
         "php-parallel-lint/php-parallel-lint": "1.4.0",
         "phpstan/extension-installer": "1.4.3",
-        "phpstan/phpstan": "1.12.28 || 2.1.25",
-        "phpstan/phpstan-phpunit": "1.4.2 || 2.0.7",
-        "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.6",
-        "phpunit/phpunit": "8.5.48",
+        "phpstan/phpstan": "1.12.32 || 2.1.32",
+        "phpstan/phpstan-phpunit": "1.4.2 || 2.0.8",
+        "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.7",
+        "phpunit/phpunit": "8.5.52",
         "rawr/phpunit-data-provider": "3.3.1",
-        "rector/rector": "1.2.10 || 2.1.7",
+        "rector/rector": "1.2.10 || 2.2.8",
         "rector/type-perfect": "1.0.0 || 2.1.0",
+        "squizlabs/php_codesniffer": "4.0.1",
         "thecodingmachine/phpstan-safe-rule": "1.2.0 || 1.4.1"
     },
     "suggest": {
@@ -45,7 +46,11 @@
     "autoload": {
         "psr-4": {
             "Sabberworm\\CSS\\": "src/"
-        }
+        },
+        "files": [
+            "src/Rule/Rule.php",
+            "src/RuleSet/RuleContainer.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -63,66 +68,74 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "9.2.x-dev"
+            "dev-main": "9.4.x-dev"
         }
     },
     "scripts": {
-        "ci": [
-            "@ci:static",
-            "@ci:dynamic"
+        "check": [
+            "@check:static",
+            "@check:dynamic"
         ],
-        "ci:composer:normalize": "\"./.phive/composer-normalize\" --dry-run",
-        "ci:dynamic": [
-            "@ci:tests"
+        "check:composer:normalize": "\"./.phive/composer-normalize\" --dry-run",
+        "check:dynamic": [
+            "@check:tests"
         ],
-        "ci:php:fixer": "\"./.phive/php-cs-fixer\" --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff bin src tests config",
-        "ci:php:lint": "parallel-lint src tests config bin",
-        "ci:php:rector": "rector --no-progress-bar --dry-run --config=config/rector.php",
-        "ci:php:stan": "phpstan --no-progress --configuration=config/phpstan.neon",
-        "ci:static": [
-            "@ci:composer:normalize",
-            "@ci:php:fixer",
-            "@ci:php:lint",
-            "@ci:php:rector",
-            "@ci:php:stan"
+        "check:php:codesniffer": "phpcs --standard=config/phpcs.xml bin config src tests",
+        "check:php:fixer": "\"./.phive/php-cs-fixer\" --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff bin config src tests",
+        "check:php:lint": "parallel-lint bin config src tests",
+        "check:php:rector": "rector process --no-progress-bar --dry-run --config=config/rector.php",
+        "check:php:stan": "phpstan --no-progress --configuration=config/phpstan.neon",
+        "check:static": [
+            "@check:composer:normalize",
+            "@check:php:fixer",
+            "@check:php:codesniffer",
+            "@check:php:lint",
+            "@check:php:rector",
+            "@check:php:stan"
         ],
-        "ci:tests": [
-            "@ci:tests:unit"
+        "check:tests": [
+            "@check:tests:unit"
         ],
-        "ci:tests:coverage": "phpunit --do-not-cache-result --coverage-clover=coverage.xml",
-        "ci:tests:sof": "phpunit --stop-on-failure --do-not-cache-result",
-        "ci:tests:unit": "phpunit --do-not-cache-result",
+        "check:tests:coverage": "phpunit --do-not-cache-result --coverage-clover=coverage.xml",
+        "check:tests:sof": "phpunit --stop-on-failure --do-not-cache-result",
+        "check:tests:unit": "phpunit --do-not-cache-result",
         "fix": [
             "@fix:php"
         ],
         "fix:composer:normalize": "\"./.phive/composer-normalize\" --no-check-lock",
         "fix:php": [
             "@fix:composer:normalize",
             "@fix:php:rector",
+            "@fix:php:codesniffer",
             "@fix:php:fixer"
         ],
-        "fix:php:fixer": "\"./.phive/php-cs-fixer\" --config=config/php-cs-fixer.php fix bin src tests",
-        "fix:php:rector": "rector --config=config/rector.php",
-        "phpstan:baseline": "phpstan --configuration=config/phpstan.neon --generate-baseline=config/phpstan-baseline.neon --allow-empty-baseline"
+        "fix:php:codesniffer": "phpcbf --standard=config/phpcs.xml bin config src tests",
+        "fix:php:fixer": "\"./.phive/php-cs-fixer\" --config=config/php-cs-fixer.php fix bin config src tests",
+        "fix:php:rector": "rector process --config=config/rector.php",
+        "phpstan:baseline": "phpstan --configuration=config/phpstan.neon --generate-baseline=config/phpstan-baseline.neon --allow-empty-baseline",
+        "phpstan:clearcache": "phpstan clear-result-cache"
     },
     "scripts-descriptions": {
-        "ci": "Runs all dynamic and static code checks.",
-        "ci:composer:normalize": "Checks the formatting and structure of the composer.json.",
-        "ci:dynamic": "Runs all dynamic code checks (i.e., currently, the unit tests).",
-        "ci:php:fixer": "Checks the code style with PHP CS Fixer.",
-        "ci:php:lint": "Checks the syntax of the PHP code.",
-        "ci:php:rector": "Checks the code for possible code updates and refactoring.",
-        "ci:php:stan": "Checks the types with PHPStan.",
-        "ci:static": "Runs all static code analysis checks for the code.",
-        "ci:tests": "Runs all dynamic tests (i.e., currently, the unit tests).",
-        "ci:tests:coverage": "Runs the unit tests with code coverage.",
-        "ci:tests:sof": "Runs the unit tests and stops at the first failure.",
-        "ci:tests:unit": "Runs all unit tests.",
+        "check": "Runs all dynamic and static code checks.",
+        "check:composer:normalize": "Checks the formatting and structure of the composer.json.",
+        "check:dynamic": "Runs all dynamic code checks (i.e., currently, the unit tests).",
+        "check:php:codesniffer": "Checks the code style with PHP_CodeSniffer.",
+        "check:php:fixer": "Checks the code style with PHP CS Fixer.",
+        "check:php:lint": "Checks the syntax of the PHP code.",
+        "check:php:rector": "Checks the code for possible code updates and refactoring.",
+        "check:php:stan": "Checks the types with PHPStan.",
+        "check:static": "Runs all static code analysis checks for the code.",
+        "check:tests": "Runs all dynamic tests (i.e., currently, the unit tests).",
+        "check:tests:coverage": "Runs the unit tests with code coverage.",
+        "check:tests:sof": "Runs the unit tests and stops at the first failure.",
+        "check:tests:unit": "Runs all unit tests.",
         "fix": "Runs all fixers",
         "fix:composer:normalize": "Reformats and sorts the composer.json file.",
         "fix:php": "Autofixes all autofixable issues in the PHP code.",
+        "fix:php:codesniffer": "Reformats the code with PHP_CodeSniffer.",
         "fix:php:fixer": "Fixes autofixable issues found by PHP CS Fixer.",
         "fix:php:rector": "Fixes autofixable issues found by Rector.",
-        "phpstan:baseline": "Updates the PHPStan baseline file to match the code."
+        "phpstan:baseline": "Updates the PHPStan baseline file to match the code.",
+        "phpstan:clearcache": "Clears the PHPStan cache."
     }
 }