From bab7ba3071ef81a0a8e0727e11b81bfd4e3ba9ef Mon Sep 17 00:00:00 2001 From: Elanor Date: Thu, 9 Jan 2025 11:35:35 -0500 Subject: [PATCH 1/5] Update UrlHelper.php Version 3.9.10 contained php8 only code, so this will fix it for everyone still using PHP 7 - fixes #1560 --- src/helpers/UrlHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/UrlHelper.php b/src/helpers/UrlHelper.php index dbef995b0..4efd6595f 100644 --- a/src/helpers/UrlHelper.php +++ b/src/helpers/UrlHelper.php @@ -287,7 +287,7 @@ public static function getSiteUrlOverrideSetting(?int $siteId = null): string */ public static function encodeUrl(string $url): string { - $parts = preg_split('/([:\/?#\[\]@!$&\'()*+,;=%])/', $url, flags: PREG_SPLIT_DELIM_CAPTURE); + $parts = preg_split('/([:\/?#\[\]@!$&\'()*+,;=%])/', $url, null, PREG_SPLIT_DELIM_CAPTURE); $url = ''; foreach ($parts as $i => $part) { if ($i % 2 === 0) { From af2dac963a58751d5ee58e9481c4e844e5635053 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 9 Jan 2025 12:03:11 -0500 Subject: [PATCH 2/5] refactor: Add `platform` so phpstan with analyze code for our specific platform --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index 713b69d7c..130185dba 100644 --- a/composer.json +++ b/composer.json @@ -74,6 +74,10 @@ "yiisoft/yii2-composer": true }, "optimize-autoloader": true, + "platform": { + "php": "7.2.5" + }, + "platform-check": false, "sort-packages": true }, "autoload": { From 34dfd0d8b597644cc5a1a7f827c54abc3fa14b60 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 9 Jan 2025 12:08:11 -0500 Subject: [PATCH 3/5] chore: Updated deps --- buildchain/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildchain/package-lock.json b/buildchain/package-lock.json index c7ae1f545..7cf67f927 100644 --- a/buildchain/package-lock.json +++ b/buildchain/package-lock.json @@ -1907,9 +1907,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001690", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", - "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", + "version": "1.0.30001692", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", + "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==", "dev": true, "funding": [ { From ced25cbc200029277bc737a5fe44d0b8ea0b0048 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 9 Jan 2025 12:08:48 -0500 Subject: [PATCH 4/5] refactor: fixed `phpstan` so it will check for platform errors properly going forward ([#1561](https://github.com/nystudio107/craft-seomatic/pull/1561)) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 130185dba..d4f759b48 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "nystudio107/craft-seomatic", "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 3. It is a turnkey SEO system that is comprehensive, powerful, and flexible.", "type": "craft-plugin", - "version": "3.5.10", + "version": "3.5.11", "keywords": [ "craft", "cms", From 1bbb4e56701096c5c298922e53298178aca606c2 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 9 Jan 2025 12:08:54 -0500 Subject: [PATCH 5/5] chore: Version 3.5.11 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ee094ab4..81b90d02e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # SEOmatic Changelog +## 3.5.11 - 2025.01.09 +### Fixed +* Fixed a regression that would throw an error on PHP < 8, and also fixed `phpstan` so it will check for platform errors properly going forward ([#1561](https://github.com/nystudio107/craft-seomatic/pull/1561)) + ## 3.5.10 - 2025.01.08 ### Changed * Encode the URI in the `canonical` `link` header ([#1519](https://github.com/nystudio107/craft-seomatic/issues/1519))