From c77692c734a871af14a3e05adbfede1eaf040309 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Thu, 15 Feb 2024 09:30:57 -0800 Subject: [PATCH 1/2] Bump php-css-parser to 8.5.0 --- composer.json | 2 +- composer.lock | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 4d7a45752eb..754cb22efe3 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "ampproject/amp-toolbox": "0.11.5", "cweagans/composer-patches": "^1.0", "fasterimage/fasterimage": "1.5.0", - "sabberworm/php-css-parser": "dev-master#cc791ad" + "sabberworm/php-css-parser": "8.5.0" }, "require-dev": { "automattic/vipwpcs": "^3.0", diff --git a/composer.lock b/composer.lock index 8b7d710d75f..fd40bff152c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c2638f309d61f5fe978e1e461346f533", + "content-hash": "cdec734bc3500d2cb84d120bdde9554a", "packages": [ { "name": "ampproject/amp-toolbox", @@ -189,16 +189,16 @@ }, { "name": "sabberworm/php-css-parser", - "version": "dev-master", + "version": "8.5.0", "source": { "type": "git", - "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "cc791ad" + "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git", + "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/cc791ad", - "reference": "cc791ad", + "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", + "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", "shasum": "" }, "require": { @@ -212,8 +212,12 @@ "suggest": { "ext-mbstring": "for parsing UTF-8 CSS" }, - "default-branch": true, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.0.x-dev" + } + }, "autoload": { "psr-4": { "Sabberworm\\CSS\\": "src/" @@ -236,10 +240,10 @@ "stylesheet" ], "support": { - "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", - "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/master" + "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues", + "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/8.5.0" }, - "time": "2023-01-25T01:20:01+00:00" + "time": "2024-02-01T00:40:08+00:00" }, { "name": "willwashburn/stream", @@ -8190,7 +8194,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "sabberworm/php-css-parser": 20, "roave/security-advisories": 20 }, "prefer-stable": true, @@ -8210,5 +8213,5 @@ "platform-overrides": { "php": "7.4" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.2.0" } From 4bbec27fabb501f855feadeb84eb1a2ad6aad8c6 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Thu, 15 Feb 2024 09:51:20 -0800 Subject: [PATCH 2/2] Bump php-css-parser to 8.5.1 --- composer.json | 2 +- composer.lock | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 754cb22efe3..4049f286133 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "ampproject/amp-toolbox": "0.11.5", "cweagans/composer-patches": "^1.0", "fasterimage/fasterimage": "1.5.0", - "sabberworm/php-css-parser": "8.5.0" + "sabberworm/php-css-parser": "8.5.1" }, "require-dev": { "automattic/vipwpcs": "^3.0", diff --git a/composer.lock b/composer.lock index fd40bff152c..f9d5d0de301 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cdec734bc3500d2cb84d120bdde9554a", + "content-hash": "b895608e131622df90c44f80ccf9a2cf", "packages": [ { "name": "ampproject/amp-toolbox", @@ -189,16 +189,16 @@ }, { "name": "sabberworm/php-css-parser", - "version": "8.5.0", + "version": "v8.5.1", "source": { "type": "git", "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git", - "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0" + "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", - "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", + "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152", + "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152", "shasum": "" }, "require": { @@ -206,7 +206,6 @@ "php": ">=5.6.20" }, "require-dev": { - "codacy/coverage": "^1.4.3", "phpunit/phpunit": "^5.7.27" }, "suggest": { @@ -215,7 +214,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.0.x-dev" + "dev-main": "9.0.x-dev" } }, "autoload": { @@ -230,6 +229,14 @@ "authors": [ { "name": "Raphael Schweikert" + }, + { + "name": "Oliver Klee", + "email": "github@oliverklee.de" + }, + { + "name": "Jake Hotson", + "email": "jake.github@qzdesign.co.uk" } ], "description": "Parser for CSS Files written in PHP", @@ -241,9 +248,9 @@ ], "support": { "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues", - "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/8.5.0" + "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1" }, - "time": "2024-02-01T00:40:08+00:00" + "time": "2024-02-15T16:41:13+00:00" }, { "name": "willwashburn/stream",