opdavies/oliverdavies.uk-drupal
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "Downgrade PHP to 8.1"

Browse source 
This reverts commit e3f18accef.
This commit is contained in:
Oliver Davies 2024-04-15 07:51:52 +01:00
parent d2ec2d4ab4
commit b88c386003
4 changed files with 68 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,6 +1,6 @@
# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. # Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs.
FROM php:8.1-apache AS base FROM php:8.2-apache AS base
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
RUN which composer && composer -V RUN which composer && composer -V

2
build.yaml
View file

@ -13,7 +13,7 @@ database:
extra_databases: [] extra_databases: []
php: php:
version: 8.1-apache version: 8.2-apache
phpcs: phpcs:
paths: paths:
- web/modules/custom - web/modules/custom

8
composer.json
View file

@ -34,7 +34,7 @@
"drupal/speakerdeck_field": "^2.0", "drupal/speakerdeck_field": "^2.0",
"drupal/video_embed_field": "^2.5", "drupal/video_embed_field": "^2.5",
"drush/drush": "^12.5", "drush/drush": "^12.5",
"illuminate/collections": "^10", "illuminate/collections": "^11.3",
"league/commonmark": "^1.0", "league/commonmark": "^1.0",
"nesbot/carbon": "^3.2" "nesbot/carbon": "^3.2"
}, },
@ -111,7 +111,11 @@
" composer remove drupal/core-project-message" " composer remove drupal/core-project-message"
] ]
}, },
"patches": {} "patches": {
"drupal/markdown": {
"SubformState incorrect interface error": "./tools/patches/drupal/markdown/3409277-29.diff"
}
}
}, },
"require-dev": { "require-dev": {
"drupal/core-dev": "^10.2" "drupal/core-dev": "^10.2"

121
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b8444e9daa71c0371d8a22fefeed9941", "content-hash": "5c895fe7237c9b57c482ea50847e0bc8",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
@ -3344,31 +3344,31 @@
}, },
{ {
"name": "illuminate/collections", "name": "illuminate/collections",
"version": "v10.48.7", "version": "v11.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/collections.git", "url": "https://github.com/illuminate/collections.git",
"reference": "f9589f1063a449111dcaa1d68285b507d9483a95" "reference": "aee944e8220588756e21aa4c30eebd5f6481e453"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95", "url": "https://api.github.com/repos/illuminate/collections/zipball/aee944e8220588756e21aa4c30eebd5f6481e453",
"reference": "f9589f1063a449111dcaa1d68285b507d9483a95", "reference": "aee944e8220588756e21aa4c30eebd5f6481e453",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"illuminate/conditionable": "^10.0", "illuminate/conditionable": "^11.0",
"illuminate/contracts": "^10.0", "illuminate/contracts": "^11.0",
"illuminate/macroable": "^10.0", "illuminate/macroable": "^11.0",
"php": "^8.1" "php": "^8.2"
}, },
"suggest": { "suggest": {
"symfony/var-dumper": "Required to use the dump method (^6.2)." "symfony/var-dumper": "Required to use the dump method (^7.0)."
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "10.x-dev" "dev-master": "11.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -3395,20 +3395,20 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2024-03-20T20:09:13+00:00" "time": "2024-04-04T17:36:49+00:00"
}, },
{ {
"name": "illuminate/conditionable", "name": "illuminate/conditionable",
"version": "v10.48.7", "version": "v11.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/conditionable.git", "url": "https://github.com/illuminate/conditionable.git",
"reference": "d0958e4741fc9d6f516a552060fd1b829a85e009" "reference": "8a558fec063b6a63da1c3af1d219c0f998edffeb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/conditionable/zipball/d0958e4741fc9d6f516a552060fd1b829a85e009", "url": "https://api.github.com/repos/illuminate/conditionable/zipball/8a558fec063b6a63da1c3af1d219c0f998edffeb",
"reference": "d0958e4741fc9d6f516a552060fd1b829a85e009", "reference": "8a558fec063b6a63da1c3af1d219c0f998edffeb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3417,7 +3417,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "10.x-dev" "dev-master": "11.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -3441,31 +3441,31 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2023-02-03T08:06:17+00:00" "time": "2024-04-04T17:36:49+00:00"
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
"version": "v10.48.7", "version": "v11.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/contracts.git", "url": "https://github.com/illuminate/contracts.git",
"reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac" "reference": "28bc6fb6fe3debb27a19b12a59288ed2d1bd4008"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac", "url": "https://api.github.com/repos/illuminate/contracts/zipball/28bc6fb6fe3debb27a19b12a59288ed2d1bd4008",
"reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac", "reference": "28bc6fb6fe3debb27a19b12a59288ed2d1bd4008",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^8.1", "php": "^8.2",
"psr/container": "^1.1.1|^2.0.1", "psr/container": "^1.1.1|^2.0.1",
"psr/simple-cache": "^1.0|^2.0|^3.0" "psr/simple-cache": "^1.0|^2.0|^3.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "10.x-dev" "dev-master": "11.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -3489,29 +3489,29 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2024-01-15T18:52:32+00:00" "time": "2024-04-04T17:36:49+00:00"
}, },
{ {
"name": "illuminate/macroable", "name": "illuminate/macroable",
"version": "v10.48.7", "version": "v11.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/macroable.git", "url": "https://github.com/illuminate/macroable.git",
"reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27" "reference": "e1be58f9b2af73f242dc6a9add1f376b3ec89eef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27", "url": "https://api.github.com/repos/illuminate/macroable/zipball/e1be58f9b2af73f242dc6a9add1f376b3ec89eef",
"reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27", "reference": "e1be58f9b2af73f242dc6a9add1f376b3ec89eef",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^8.1" "php": "^8.2"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "10.x-dev" "dev-master": "11.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -3535,7 +3535,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2023-06-05T12:46:42+00:00" "time": "2023-06-08T14:08:27+00:00"
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
@ -5039,20 +5039,20 @@
}, },
{ {
"name": "symfony/clock", "name": "symfony/clock",
"version": "v6.4.5", "version": "v7.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/clock.git", "url": "https://github.com/symfony/clock.git",
"reference": "ecba44be4def12cd71e0460b956ab7e51a2c980e" "reference": "8b9d08887353d627d5f6c3bf3373b398b49051c2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/clock/zipball/ecba44be4def12cd71e0460b956ab7e51a2c980e", "url": "https://api.github.com/repos/symfony/clock/zipball/8b9d08887353d627d5f6c3bf3373b398b49051c2",
"reference": "ecba44be4def12cd71e0460b956ab7e51a2c980e", "reference": "8b9d08887353d627d5f6c3bf3373b398b49051c2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.1", "php": ">=8.2",
"psr/clock": "^1.0", "psr/clock": "^1.0",
"symfony/polyfill-php83": "^1.28" "symfony/polyfill-php83": "^1.28"
}, },
@ -5093,7 +5093,7 @@
"time" "time"
], ],
"support": { "support": {
"source": "https://github.com/symfony/clock/tree/v6.4.5" "source": "https://github.com/symfony/clock/tree/v7.0.5"
}, },
"funding": [ "funding": [
{ {
@ -5109,7 +5109,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-03-01T14:02:27+00:00" "time": "2024-03-02T12:46:12+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
@ -7370,33 +7370,32 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v6.4.4", "version": "v7.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e" "reference": "5b75e872f7d135d7abb4613809fadc8d9f3d30a0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e", "url": "https://api.github.com/repos/symfony/translation/zipball/5b75e872f7d135d7abb4613809fadc8d9f3d30a0",
"reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e", "reference": "5b75e872f7d135d7abb4613809fadc8d9f3d30a0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.1", "php": ">=8.2",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^2.5|^3.0" "symfony/translation-contracts": "^2.5|^3.0"
}, },
"conflict": { "conflict": {
"symfony/config": "<5.4", "symfony/config": "<6.4",
"symfony/console": "<5.4", "symfony/console": "<6.4",
"symfony/dependency-injection": "<5.4", "symfony/dependency-injection": "<6.4",
"symfony/http-client-contracts": "<2.5", "symfony/http-client-contracts": "<2.5",
"symfony/http-kernel": "<5.4", "symfony/http-kernel": "<6.4",
"symfony/service-contracts": "<2.5", "symfony/service-contracts": "<2.5",
"symfony/twig-bundle": "<5.4", "symfony/twig-bundle": "<6.4",
"symfony/yaml": "<5.4" "symfony/yaml": "<6.4"
}, },
"provide": { "provide": {
"symfony/translation-implementation": "2.3|3.0" "symfony/translation-implementation": "2.3|3.0"
@ -7404,17 +7403,17 @@
"require-dev": { "require-dev": {
"nikic/php-parser": "^4.18|^5.0", "nikic/php-parser": "^4.18|^5.0",
"psr/log": "^1|^2|^3", "psr/log": "^1|^2|^3",
"symfony/config": "^5.4|^6.0|^7.0", "symfony/config": "^6.4|^7.0",
"symfony/console": "^5.4|^6.0|^7.0", "symfony/console": "^6.4|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/dependency-injection": "^6.4|^7.0",
"symfony/finder": "^5.4|^6.0|^7.0", "symfony/finder": "^6.4|^7.0",
"symfony/http-client-contracts": "^2.5|^3.0", "symfony/http-client-contracts": "^2.5|^3.0",
"symfony/http-kernel": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^6.4|^7.0",
"symfony/intl": "^5.4|^6.0|^7.0", "symfony/intl": "^6.4|^7.0",
"symfony/polyfill-intl-icu": "^1.21", "symfony/polyfill-intl-icu": "^1.21",
"symfony/routing": "^5.4|^6.0|^7.0", "symfony/routing": "^6.4|^7.0",
"symfony/service-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3",
"symfony/yaml": "^5.4|^6.0|^7.0" "symfony/yaml": "^6.4|^7.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -7445,7 +7444,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v6.4.4" "source": "https://github.com/symfony/translation/tree/v7.0.4"
}, },
"funding": [ "funding": [
{ {
@ -7461,7 +7460,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-02-20T13:16:58+00:00" "time": "2024-02-22T20:27:20+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",