Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-19 18:10:00 +02:00
Code Issues Packages Projects Releases Activity

Swtiched to forked getgrav/Twig 2.x with PHP 8.4 support

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-01-27 14:03:31 -07:00
parent de2af9e470
commit 2fadc14c01
3 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -3,6 +3,13 @@
1. [](#bugfix)
* Fixed a PHP compatibility issue with `AbstractLazyCollection`
1. [](#improved)
* Global PHP 8.2 code optimizations
* More PHP 8.4 compatibility fixes
* Twig 2.x forked to getgrav/twig 2.x for PHP 8.4 compatibility
* Switch to cache@v4 + limit PHP version for Github actions
* Trigger testing Github action for Grav 1.8
* Merge latest Grav 1.7 fixes into Grav 1.8
# v1.8.0-beta.3
## 11/21/2024

6
composer.json
View File

@@ -37,7 +37,7 @@
"symfony/var-dumper": "^6.4",
"symfony/process": "^6.4",
"symfony/http-client": "^6.4",
"twig/twig": "^2.16",
"twig/twig": "2.x-dev",
"monolog/monolog": "^2.0",
"doctrine/cache": "^2.2",
"doctrine/collections": "^2.2",
@@ -79,6 +79,10 @@
{
"type": "vcs",
"url": "https://github.com/rockettheme/toolbox"
},
{
"type": "vcs",
"url": "https://github.com/getgrav/twig"
}
],
"replace": {

59
composer.lock generated
View File

@@ -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": "170993cce7210f7c1ec916c475f27729",
"content-hash": "4ce06e3bc36838baa9d76646874bde0b",
"packages": [
{
"name": "antoligy/dom-string-iterators",
@@ -677,16 +677,16 @@
},
{
"name": "filp/whoops",
"version": "2.16.0",
"version": "2.17.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
"reference": "075bc0c26631110584175de6523ab3f1652eb28e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
"reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
"url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
"reference": "075bc0c26631110584175de6523ab3f1652eb28e",
"shasum": ""
},
"require": {
@@ -736,7 +736,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.16.0"
"source": "https://github.com/filp/whoops/tree/2.17.0"
},
"funding": [
{
@@ -744,7 +744,7 @@
"type": "github"
}
],
"time": "2024-09-25T12:00:00+00:00"
"time": "2025-01-25T12:00:00+00:00"
},
{
"name": "getgrav/cache",
@@ -4081,16 +4081,16 @@
},
{
"name": "twig/twig",
"version": "v2.16.1",
"version": "2.x-dev",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "19185947ec75d433a3ac650af32fc05649b95ee1"
"url": "https://github.com/getgrav/Twig.git",
"reference": "8aef0f1eac35bdd742f12d755875d242c91c2d90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/19185947ec75d433a3ac650af32fc05649b95ee1",
"reference": "19185947ec75d433a3ac650af32fc05649b95ee1",
"url": "https://api.github.com/repos/getgrav/Twig/zipball/8aef0f1eac35bdd742f12d755875d242c91c2d90",
"reference": "8aef0f1eac35bdd742f12d755875d242c91c2d90",
"shasum": ""
},
"require": {
@@ -4101,6 +4101,7 @@
},
"require-dev": {
"psr/container": "^1.0",
"rector/rector": "dev-main",
"symfony/phpunit-bridge": "^5.4.9|^6.3"
},
"type": "library",
@@ -4117,7 +4118,11 @@
"Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"autoload-dev": {
"psr-4": {
"Twig\\Tests\\": "tests/"
}
},
"license": [
"BSD-3-Clause"
],
@@ -4144,20 +4149,9 @@
"templating"
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v2.16.1"
"source": "https://github.com/getgrav/Twig/tree/2.x"
},
"funding": [
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/twig/twig",
"type": "tidelift"
}
],
"time": "2024-09-09T17:53:56+00:00"
"time": "2025-01-27T20:56:50+00:00"
},
{
"name": "webmozart/assert",
@@ -5419,16 +5413,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.12.15",
"version": "1.12.16",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "c91d4e8bc056f46cf653656e6f71004b254574d1"
"reference": "e0bb5cb78545aae631220735aa706eac633a6be9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1",
"reference": "c91d4e8bc056f46cf653656e6f71004b254574d1",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e0bb5cb78545aae631220735aa706eac633a6be9",
"reference": "e0bb5cb78545aae631220735aa706eac633a6be9",
"shasum": ""
},
"require": {
@@ -5473,7 +5467,7 @@
"type": "github"
}
],
"time": "2025-01-05T16:40:22+00:00"
"time": "2025-01-21T14:50:05+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -7415,7 +7409,8 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"rockettheme/toolbox": 20
"rockettheme/toolbox": 20,
"twig/twig": 20
},
"prefer-stable": false,
"prefer-lowest": false,