IntenseWebs/gantry5
3
0
Fork 0
mirror of https://github.com/gantry/gantry5.git synced 2026-08-18 17:04:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Menu Manager throwíng deprecated error in PHP 8.1 (#3073)

Browse Source
This commit is contained in:
Matias Griese
2022-09-07 09:08:37 +03:00
parent a59b170ddf
commit 8885f9f4ec
9 changed files with 183 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+9
View File
@@ -1,9 +1,18 @@
# 5.5.16
## dd/mm/2022
1. [Common](#common)
1. [](#new)
- Updated SCSS compiler to v1.11
2. [Joomla](#joomla)
1. [](#bugfix)
- Fixed fatal error in Menu particle on PHP 8 when using Joomla 4 (#3048)
- Fixed Menu Manager throwíng deprecated error in PHP 8.1 (#3073)
3. [WordPress](#wordpress)
1. [](#new)
- Updated Timber to v1.20
2. [](#bugfix)
- Fixed Menu Manager throwing deprecated error in PHP 8.1 (#3073)
# 5.5.15
## 09/05/2022
bin/composer-update
+2 -2
View File
@@ -5,8 +5,8 @@ setlocale(LC_ALL, ['en_GB.utf8', 'en_GB']);
date_default_timezone_set('America/Denver');
chdir(__DIR__ . '/..');
echo "# Running composer update for build script\n";
composer_update('bin/builder', false);
//echo "# Running composer update for build script\n";
//composer_update('bin/builder', false);
chdir('platforms');
platforms/grav/gantry5/compat/composer.lock
Generated
+12 -6
View File
@@ -8,16 +8,16 @@
"packages": [
{
"name": "scssphp/scssphp",
"version": "v1.10.3",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713"
"reference": "33749d12c2569bb24071f94e9af828662dabb068"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068",
"reference": "33749d12c2569bb24071f94e9af828662dabb068",
"shasum": ""
},
"require": {
@@ -44,6 +44,12 @@
"bin/pscss"
],
"type": "library",
"extra": {
"bamarni-bin": {
"forward-command": false,
"bin-links": false
}
},
"autoload": {
"psr-4": {
"ScssPhp\\ScssPhp\\": "src/"
@@ -76,9 +82,9 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
"source": "https://github.com/scssphp/scssphp/tree/v1.10.3"
"source": "https://github.com/scssphp/scssphp/tree/v1.11.0"
},
"time": "2022-05-16T07:22:18+00:00"
"time": "2022-09-02T21:24:55+00:00"
}
],
"packages-dev": [],
platforms/joomla/lib_gantry5/compat/composer.json
+4
View File
@@ -5,9 +5,13 @@
"require": {
"php": ">=7.2.5",
"pimple/pimple": "~3.5",
"twig/twig": "~1.44",
"scssphp/scssphp": "~1.10"
},
"replace": {
"psr/container": "*"
},
"config": {
"platform": {
"php": "7.2.5"
platforms/joomla/lib_gantry5/compat/composer.lock
Generated
+68 -9
View File
@@ -4,20 +4,73 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "af610c9a8fb2cf713bb00fa0a6794ac3",
"content-hash": "a50a4c4c4957e06f77b708af6fd95add",
"packages": [
{
"name": "scssphp/scssphp",
"version": "v1.10.3",
"name": "pimple/pimple",
"version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713"
"url": "https://github.com/silexphp/Pimple.git",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"psr/container": "^1.1 || ^2.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^5.4@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4.x-dev"
}
},
"autoload": {
"psr-0": {
"Pimple": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Pimple, a simple Dependency Injection Container",
"homepage": "https://pimple.symfony.com",
"keywords": [
"container",
"dependency injection"
],
"support": {
"source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
},
"time": "2021-10-28T11:13:42+00:00"
},
{
"name": "scssphp/scssphp",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
"reference": "33749d12c2569bb24071f94e9af828662dabb068"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068",
"reference": "33749d12c2569bb24071f94e9af828662dabb068",
"shasum": ""
},
"require": {
@@ -44,6 +97,12 @@
"bin/pscss"
],
"type": "library",
"extra": {
"bamarni-bin": {
"forward-command": false,
"bin-links": false
}
},
"autoload": {
"psr-4": {
"ScssPhp\\ScssPhp\\": "src/"
@@ -76,9 +135,9 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
"source": "https://github.com/scssphp/scssphp/tree/v1.10.3"
"source": "https://github.com/scssphp/scssphp/tree/v1.11.0"
},
"time": "2022-05-16T07:22:18+00:00"
"time": "2022-09-02T21:24:55+00:00"
},
{
"name": "symfony/polyfill-ctype",
platforms/wordpress/gantry5/compat/composer.json
+4
View File
@@ -5,9 +5,13 @@
"require": {
"php": ">=7.2.5",
"pimple/pimple": "~3.5",
"twig/twig": "~1.44",
"scssphp/scssphp": "~1.10"
},
"replace": {
"psr/container": "*"
},
"config": {
"platform": {
"php": "7.2.5"
platforms/wordpress/gantry5/compat/composer.lock
Generated
+68 -9
View File
@@ -4,20 +4,73 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e1459729b2d2f0a91d027897a82bf100",
"content-hash": "be734234d8f8e7f34e4847e6092d608f",
"packages": [
{
"name": "scssphp/scssphp",
"version": "v1.10.3",
"name": "pimple/pimple",
"version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713"
"url": "https://github.com/silexphp/Pimple.git",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713",
"url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"psr/container": "^1.1 || ^2.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^5.4@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4.x-dev"
}
},
"autoload": {
"psr-0": {
"Pimple": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Pimple, a simple Dependency Injection Container",
"homepage": "https://pimple.symfony.com",
"keywords": [
"container",
"dependency injection"
],
"support": {
"source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
},
"time": "2021-10-28T11:13:42+00:00"
},
{
"name": "scssphp/scssphp",
"version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
"reference": "33749d12c2569bb24071f94e9af828662dabb068"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068",
"reference": "33749d12c2569bb24071f94e9af828662dabb068",
"shasum": ""
},
"require": {
@@ -44,6 +97,12 @@
"bin/pscss"
],
"type": "library",
"extra": {
"bamarni-bin": {
"forward-command": false,
"bin-links": false
}
},
"autoload": {
"psr-4": {
"ScssPhp\\ScssPhp\\": "src/"
@@ -76,9 +135,9 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
"source": "https://github.com/scssphp/scssphp/tree/v1.10.3"
"source": "https://github.com/scssphp/scssphp/tree/v1.11.0"
},
"time": "2022-05-16T07:22:18+00:00"
"time": "2022-09-02T21:24:55+00:00"
},
{
"name": "symfony/polyfill-ctype",
platforms/wordpress/gantry5/composer.lock
Generated
+14 -14
View File
@@ -975,16 +975,16 @@
},
{
"name": "timber/timber",
"version": "1.19.2",
"version": "1.20.0",
"source": {
"type": "git",
"url": "https://github.com/timber/timber.git",
"reference": "e1460c04914c97e5d08be06d27f9df958fc17725"
"reference": "3ac8c7629656009b9e0d6d9e4ccda202aad3b8e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/timber/timber/zipball/e1460c04914c97e5d08be06d27f9df958fc17725",
"reference": "e1460c04914c97e5d08be06d27f9df958fc17725",
"url": "https://api.github.com/repos/timber/timber/zipball/3ac8c7629656009b9e0d6d9e4ccda202aad3b8e0",
"reference": "3ac8c7629656009b9e0d6d9e4ccda202aad3b8e0",
"shasum": ""
},
"require": {
@@ -992,12 +992,12 @@
"php": ">=5.3.0 || 7.*",
"twig/cache-extension": "^1.5",
"twig/twig": "^1.41 || ^2.10",
"upstatement/routes": "0.8.*"
"upstatement/routes": "0.9.*"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"johnpbloch/wordpress": "*",
"phpunit/phpunit": "5.7.16 || 6.*",
"phpunit/phpunit": "5.7.21 || 6.*",
"squizlabs/php_codesniffer": "3.*",
"wp-coding-standards/wpcs": "^2.0",
"wpackagist-plugin/advanced-custom-fields": "5.*",
@@ -1042,7 +1042,7 @@
"issues": "https://github.com/timber/timber/issues",
"source": "https://github.com/timber/timber"
},
"time": "2022-04-19T19:03:58+00:00"
"time": "2022-06-22T19:42:09+00:00"
},
{
"name": "twig/cache-extension",
@@ -1186,22 +1186,22 @@
},
{
"name": "upstatement/routes",
"version": "0.8.1",
"version": "0.9.1",
"source": {
"type": "git",
"url": "https://github.com/Upstatement/routes.git",
"reference": "02eb866668f5478d794547aa79e73dd92a989ad9"
"reference": "cac3c844ab824e4039fd26edbea5402415aa6d0a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Upstatement/routes/zipball/02eb866668f5478d794547aa79e73dd92a989ad9",
"reference": "02eb866668f5478d794547aa79e73dd92a989ad9",
"url": "https://api.github.com/repos/Upstatement/routes/zipball/cac3c844ab824e4039fd26edbea5402415aa6d0a",
"reference": "cac3c844ab824e4039fd26edbea5402415aa6d0a",
"shasum": ""
},
"require": {
"altorouter/altorouter": "^2.0.2",
"composer/installers": "~1.0",
"php": ">=5.6.0"
"composer/installers": "^1.0 || ^2.0",
"php": ">=5.6.0|7.*"
},
"require-dev": {
"phpunit/phpunit": "5.7.16",
@@ -1238,7 +1238,7 @@
"source": "https://github.com/Upstatement/routes",
"wiki": "https://github.com/Upstatement/routes/wiki"
},
"time": "2021-10-16T00:12:03+00:00"
"time": "2022-06-22T19:53:51+00:00"
}
],
"packages-dev": [
src/RealLoader.php
+2 -1
View File
@@ -112,10 +112,11 @@ abstract class RealLoader
/** @var ClassLoader $loader */
$loader = require $autoload;
// In PHP >=7.2.5 we need to use newer version of Twig.
// In PHP >=7.2.5 we need to use newer version of Pimple and Twig.
if ($useNewLibraries) {
$loader->setPsr4('Twig\\', "{$lib}/compat/vendor/twig/twig/src");
$loader->set('Twig_', "{$lib}/compat/vendor/twig/twig/lib");
$loader->set('Pimple', "{$lib}/compat/vendor/pimple/pimple/src");
}
// Skip registering SCSS compiler until it's needed.