Merge branch 'main' into patch-1

Author: sabberworm

.github/workflows/ci.yml

@@ -1,8 +1,10 @@
 # https://help.github.com/en/categories/automating-your-workflow-with-github-actions
 
 on:
-  pull_request:
   push:
+    branches:
+      - main
+  pull_request:
   schedule:
     - cron: '3 3 * * 1'
 
@@ -14,11 +16,11 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -39,29 +41,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3' ]
-        coverage: [ 'none' ]
-        include:
-          - php-version: '7.4'
-            coverage: xdebug
+        php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           ini-values: error_reporting=E_ALL
           tools: composer:v2
-          coverage: "${{ matrix.coverage }}"
+          coverage: none
 
       - name: Show the Composer configuration
         run: composer config --global --list
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/composer
           key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -74,14 +72,7 @@ jobs:
           composer show;
 
       - name: Run Tests
-        run: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
-
-      - name: Upload coverage results to Codacy
-        env:
-          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
-        if: "${{ matrix.coverage != 'none' && env.CODACY_PROJECT_TOKEN != '' }}"
-        run: |
-          ./vendor/bin/codacycoverage clover build/coverage/xml
+        run: ./vendor/bin/phpunit
 
   static-analysis:
     name: Static Analysis
@@ -93,17 +84,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - command: sniffer
-            php-version: '7.4'
-          - command: fixer
-            php-version: '7.4'
-          - command: stan
-            php-version: '7.4'
+        command:
+          - fixer
+          - stan
+        php-version:
+          - '8.3'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -116,7 +105,7 @@ jobs:
         run: composer config --global --list
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/composer
           key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
@@ -130,7 +119,7 @@ jobs:
 
       - name: Install development tools
         run: |
-          phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E,A972B9ABB95D0B760B51442231C7E470E2138192,D32680D5957DC7116BE29C14CF1A108D0E7AE720
+          phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E
 
       - name: Run Command
         run: composer ci:php:${{ matrix.command }}

.github/workflows/codecoverage.yml

@@ -0,0 +1,57 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+on:
+  push:
+    branches:
+        - main
+  pull_request:
+
+name: Code coverage
+
+jobs:
+  code-coverage:
+    name: Code coverage
+
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        php-version: [ '7.4' ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          ini-values: error_reporting=E_ALL
+          tools: composer:v2
+          coverage: xdebug
+
+      - name: Show the Composer configuration
+        run: composer config --global --list
+
+      - name: Cache dependencies installed with composer
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/composer
+          key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            php${{ matrix.php-version }}-composer-
+
+      - name: Install Composer dependencies
+        run: |
+          composer update --with-dependencies --no-progress;
+          composer show;
+
+      - name: Run Tests
+        run: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
+
+      - name: Upload coverage results to Codacy
+        env:
+          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+        if: "${{ env.CODACY_PROJECT_TOKEN != '' }}"
+        run: |
+          ./vendor/bin/codacycoverage clover build/coverage/xml

.gitignore

@@ -1,6 +1,7 @@
 /.phive/*
 /.php-cs-fixer.cache
 /.php_cs.cache
+/.phpunit.result.cache
 /composer.lock
 /phpstan.neon
 /vendor/

.phive/phars.xml

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.13.2" installed="3.13.2" location="./.phive/php-cs-fixer.phar" copy="false"/>
-  <phar name="phpcbf" version="^3.7.1" installed="3.7.1" location="./.phive/phpcbf.phar" copy="false"/>
-  <phar name="phpcs" version="^3.7.1" installed="3.7.1" location="./.phive/phpcs.phar" copy="false"/>
-  <phar name="phpstan" version="^1.9.14" installed="1.9.14" location="./.phive/phpstan.phar" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.49.0" installed="3.49.0" location="./.phive/php-cs-fixer.phar" copy="false"/>
 </phive>

CHANGELOG.md

@@ -1,4 +1,43 @@
-# Revision History
+# Changelog
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/).
+
+## x.y.z
+
+### Added
+
+- Add more tests (#449)
+
+### Changed
+
+- Add visibility to all class/interface constants (#469)
+
+### Deprecated
+
+### Removed
+
+- Drop support for PHP < 7.2 (#420)
+
+### Fixed
+
+- Fix (regression) failure to parse at-rules with strict parsing (#456)
+
+## 8.5.0
+
+### Added
+
+- Add a method to get an import's media queries (#384)
+- Add more unit tests (#381, #382)
+
+### Fixed
+
+- Retain CSSList and Rule comments when rendering CSS (#351)
+- Replace invalid `turns` unit with `turn` (#350)
+- Also allow string values for rules (#348)
+- Fix invalid calc parsing (#169)
+- Handle scientific notation when parsing sizes (#179)
+- Fix PHP 8.1 compatibility in `ParserState::strsplit()` (#344)
 
 ## 8.4.0
 

README.md

@@ -1,6 +1,6 @@
 # PHP CSS Parser
 
-[![Build Status](https://github.com/sabberworm/PHP-CSS-Parser/workflows/CI/badge.svg?branch=master)](https://github.com/sabberworm/PHP-CSS-Parser/actions/)
+[![Build Status](https://github.com/MyIntervals/PHP-CSS-Parser/workflows/CI/badge.svg?branch=main)](https://github.com/MyIntervals/PHP-CSS-Parser/actions/)
 
 A Parser for CSS Files written in PHP. Allows extraction of CSS files into a data structure, manipulation of said structure and output as (optimized) CSS.
 

composer.json

@@ -12,15 +12,26 @@
     "authors": [
         {
             "name": "Raphael Schweikert"
+        },
+        {
+            "name": "Oliver Klee",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Jake Hotson",
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php": ">=5.6.20",
+        "php": ">=7.2.0",
         "ext-iconv": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.27",
-        "codacy/coverage": "^1.4.3"
+        "codacy/coverage": "^1.4.3",
+        "phpstan/extension-installer": "^1.3.1",
+        "phpstan/phpstan": "^1.10.58",
+        "phpstan/phpstan-phpunit": "^1.3.15",
+        "phpunit/phpunit": "^8.5.36"
     },
     "suggest": {
         "ext-mbstring": "for parsing UTF-8 CSS"
@@ -35,35 +46,43 @@
             "Sabberworm\\CSS\\Tests\\": "tests/"
         }
     },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        },
+        "preferred-install": {
+            "*": "dist"
+        },
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-main": "9.0.x-dev"
+        }
+    },
     "scripts": {
         "ci": [
             "@ci:static"
         ],
         "ci:php:fixer": "@php ./.phive/php-cs-fixer.phar --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots bin src tests",
-        "ci:php:sniffer": "@php ./.phive/phpcs.phar --standard=config/phpcs.xml bin src tests",
-        "ci:php:stan": "@php ./.phive/phpstan.phar --configuration=config/phpstan.neon",
+        "ci:php:stan": "phpstan --no-progress --configuration=config/phpstan.neon",
         "ci:static": [
             "@ci:php:fixer",
-            "@ci:php:sniffer",
             "@ci:php:stan"
         ],
         "fix:php": [
-            "@fix:php:fixer",
-            "@fix:php:sniffer"
+            "@fix:php:fixer"
         ],
         "fix:php:fixer": "@php ./.phive/php-cs-fixer.phar --config=config/php-cs-fixer.php fix bin src tests",
-        "fix:php:sniffer": "@php ./.phive/phpcbf.phar --standard=config/phpcs.xml bin src tests",
-        "phpstan:baseline": "@php ./.phive/phpstan.phar --configuration=config/phpstan.neon --generate-baseline=config/phpstan-baseline.neon"
+        "phpstan:baseline": "phpstan --configuration=config/phpstan.neon --generate-baseline=config/phpstan-baseline.neon"
     },
     "scripts-descriptions": {
         "ci": "Runs all dynamic and static code checks (i.e. currently, only the static checks).",
         "ci:php:fixer": "Checks the code style with PHP CS Fixer.",
-        "ci:php:sniffer": "Checks the code style with PHP_CodeSniffer.",
         "ci:php:stan": "Checks the types with PHPStan.",
         "ci:static": "Runs all static code analysis checks for the code.",
         "fix:php": "Autofixes all autofixable issues in the PHP code.",
         "fix:php:fixer": "Fixes autofixable issues found by PHP CS Fixer.",
-        "fix:php:sniffer": "Fixes autofixable issues found by PHP_CodeSniffer.",
         "phpstand:baseline": "Updates the PHPStan baseline file to match the code."
     }
 }

config/php-cs-fixer.php

@@ -8,25 +8,27 @@
     ->setRiskyAllowed(true)
     ->setRules(
         [
-            '@PSR12' => true,
-            // Disable constant visibility from the PSR12 rule set as this would break compatibility with PHP < 7.1.
-            'visibility_required' => ['elements' => ['property', 'method']],
+            '@PER-CS2.0' => true,
+            '@PER-CS2.0:risky' => true,
 
             '@PHPUnit50Migration:risky' => true,
             '@PHPUnit52Migration:risky' => true,
             '@PHPUnit54Migration:risky' => true,
             '@PHPUnit55Migration:risky' => true,
             '@PHPUnit56Migration:risky' => true,
             '@PHPUnit57Migration:risky' => true,
+            '@PHPUnit60Migration:risky' => true,
+            '@PHPUnit75Migration:risky' => true,
+            '@PHPUnit84Migration:risky' => true,
 
             'php_unit_construct' => true,
-            'php_unit_dedicate_assert' => ['target' => '5.6'],
-            'php_unit_expectation' => ['target' => '5.6'],
+            'php_unit_dedicate_assert' => ['target' => 'newest'],
+            'php_unit_expectation' => ['target' => 'newest'],
             'php_unit_fqcn_annotation' => true,
             'php_unit_method_casing' => true,
-            'php_unit_mock' => ['target' => '5.5'],
+            'php_unit_mock' => ['target' => 'newest'],
             'php_unit_mock_short_will_return' => true,
-            'php_unit_namespaced' => ['target' => '5.7'],
+            'php_unit_namespaced' => ['target' => 'newest'],
             'php_unit_set_up_tear_down_visibility' => true,
             'php_unit_test_annotation' => ['style' => 'annotation'],
             'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],

config/phpcs.xml

@@ -10,11 +10,6 @@ parameters:
 			count: 2
 			path: ../src/RuleSet/DeclarationBlock.php
 
-		-
-			message: "#^Variable \\$oRule might not be defined\\.$#"
-			count: 2
-			path: ../src/RuleSet/DeclarationBlock.php
-
 		-
 			message: "#^Variable \\$oVal might not be defined\\.$#"
 			count: 1