From 90b5fbed125ed0168160a31385781bf0a702742e Mon Sep 17 00:00:00 2001 From: acoulton Date: Thu, 6 Jun 2024 10:51:46 +0100 Subject: [PATCH 1/2] Upgrade to PHP8.2 & bump packages Prevents mr-depp taking it backwards as the newer versions now require a version of symfony/console that only works on >=8.2 Dev-ver-changes --------------- * composer/satis 2beb9674 => b9fa13f1 https://github.com/composer/satis/compare/2beb967460c98c61d3f75e45bbd820dcaaa80f42...b9fa13f175345821e6e775dd90815d8f504bd42b Major ----- * symfony/console v6.4.7 => v7.1.1 https://github.com/symfony/console/compare/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f...9b008f2d7b21c74ef4d0c3de6077a642bc55ece3 * symfony/filesystem v6.4.7 => v7.1.1 https://github.com/symfony/filesystem/compare/78dde75f8f6dbbca4ec436a4b0087f7af02076d4...802e87002f919296c9f606457d9fa327a0b3d6b2 * symfony/finder v6.4.7 => v7.1.1 https://github.com/symfony/finder/compare/511c48990be17358c23bf45c5d71ab85d40fb764...fbb0ba67688b780efbc886c1a0a0948dcf7205d6 * symfony/mime v6.4.7 => v7.1.1 https://github.com/symfony/mime/compare/decadcf3865918ecfcbfa90968553994ce935a5e...21027eaacc1a8a20f5e616c25c3580f5dd3a15df * symfony/process v6.4.7 => v7.1.1 https://github.com/symfony/process/compare/cdb1c81c145fd5aa9b0038bab694035020943381...febf90124323a093c7ee06fdb30e765ca3c20028 * symfony/string v6.4.7 => v7.1.1 https://github.com/symfony/string/compare/ffeb9591c61f65a68d47f77d12b83fa530227a69...60bc311c74e0af215101235aa6f471bcbc032df2 Minor ----- * composer/class-map-generator 1.1.1 => 1.3.2 https://github.com/composer/class-map-generator/compare/8286a62d243312ed99b3eee20d5005c961adb311...acd227952154850d0bb7d65caa4f9edf9cd806a7 * react/promise v3.1.0 => v3.2.0 https://github.com/reactphp/promise/compare/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c...8a164643313c71354582dc850b42b33fa12a4b63 * twig/html-extra v3.9.0 => v3.10.0 https://github.com/twigphp/html-extra/compare/8d8bf63a958bec84dbbf12d6c9958319bbaa2eea...1c045fc28ace0dcaf464f8e0d4e2aca6347d5fda * twig/twig v3.9.3 => v3.10.3 https://github.com/twigphp/Twig/compare/a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58...67f29781ffafa520b0bbfbd8384674b42db04572 Bugfix ------ * composer/pcre 3.1.3 => 3.1.4 https://github.com/composer/pcre/compare/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8...04229f163664973f68f38f6f73d917799168ef24 --- Dockerfile | 3 +- composer.json | 2 +- composer.lock | 237 +++++++++++++++++++++++++------------------------- 3 files changed, 121 insertions(+), 121 deletions(-) diff --git a/Dockerfile b/Dockerfile index f849c56..7656aca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-cli-alpine +FROM php:8.2-cli-alpine LABEL org.opencontainers.image.source https://github.com/ingenerator/action-satis-builder RUN apk add --no-cache --upgrade \ bash \ @@ -14,4 +14,3 @@ RUN apk add --no-cache --upgrade \ ENV COMPOSER_HOME /composer COPY ./builder /repo-builder/ ENTRYPOINT ["/repo-builder/build-package-repo.sh"] - diff --git a/composer.json b/composer.json index ef733ff..27a0d3a 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "config": { "preferred-install": "dist", "platform": { - "php": "8.1", + "php": "8.2", "ext-openssl": "0" }, "vendor-dir": "builder/vendor", diff --git a/composer.lock b/composer.lock index f6e269a..13c4977 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": "4f99dcd50c143227a0d67aee659c490f", + "content-hash": "2d29c12c396153e8a9698d8db42fd255", "packages": [ { "name": "composer/ca-bundle", @@ -84,16 +84,16 @@ }, { "name": "composer/class-map-generator", - "version": "1.1.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "8286a62d243312ed99b3eee20d5005c961adb311" + "reference": "acd227952154850d0bb7d65caa4f9edf9cd806a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8286a62d243312ed99b3eee20d5005c961adb311", - "reference": "8286a62d243312ed99b3eee20d5005c961adb311", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/acd227952154850d0bb7d65caa4f9edf9cd806a7", + "reference": "acd227952154850d0bb7d65caa4f9edf9cd806a7", "shasum": "" }, "require": { @@ -137,7 +137,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.1.1" + "source": "https://github.com/composer/class-map-generator/tree/1.3.2" }, "funding": [ { @@ -153,7 +153,7 @@ "type": "tidelift" } ], - "time": "2024-03-15T12:53:41+00:00" + "time": "2024-05-31T19:45:56+00:00" }, { "name": "composer/composer", @@ -340,16 +340,16 @@ }, { "name": "composer/pcre", - "version": "3.1.3", + "version": "3.1.4", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" + "reference": "04229f163664973f68f38f6f73d917799168ef24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", + "reference": "04229f163664973f68f38f6f73d917799168ef24", "shasum": "" }, "require": { @@ -391,7 +391,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.3" + "source": "https://github.com/composer/pcre/tree/3.1.4" }, "funding": [ { @@ -407,7 +407,7 @@ "type": "tidelift" } ], - "time": "2024-03-19T10:26:25+00:00" + "time": "2024-05-27T13:40:54+00:00" }, { "name": "composer/satis", @@ -415,22 +415,22 @@ "source": { "type": "git", "url": "https://github.com/composer/satis.git", - "reference": "2beb967460c98c61d3f75e45bbd820dcaaa80f42" + "reference": "b9fa13f175345821e6e775dd90815d8f504bd42b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/satis/zipball/2beb967460c98c61d3f75e45bbd820dcaaa80f42", - "reference": "2beb967460c98c61d3f75e45bbd820dcaaa80f42", + "url": "https://api.github.com/repos/composer/satis/zipball/b9fa13f175345821e6e775dd90815d8f504bd42b", + "reference": "b9fa13f175345821e6e775dd90815d8f504bd42b", "shasum": "" }, "require": { "composer-plugin-api": "^2.3.0", - "composer/composer": "^2.6.4", + "composer/composer": "^2.7.6", "ext-zip": "*", "php": "^8.1", - "symfony/console": "^6.3.4", - "twig/html-extra": "^3.9.0", - "twig/twig": "^3.9.3" + "symfony/console": "^7.0.7", + "twig/html-extra": "^3.10.0", + "twig/twig": "^3.10.3" }, "replace": { "symfony/polyfill-php72": "*", @@ -442,7 +442,7 @@ "require-dev": { "ext-json": "*", "mikey179/vfsstream": "^1.6.11", - "phpunit/phpunit": "^9.6.13" + "phpunit/phpunit": "^9.6.19" }, "default-branch": true, "bin": [ @@ -502,7 +502,7 @@ "type": "custom" } ], - "time": "2024-05-10T08:00:35+00:00" + "time": "2024-06-03T13:37:29+00:00" }, { "name": "composer/semver", @@ -780,12 +780,12 @@ "version": "v5.2.13", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", + "url": "https://github.com/jsonrainbow/json-schema.git", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, @@ -840,8 +840,8 @@ "schema" ], "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + "issues": "https://github.com/jsonrainbow/json-schema/issues", + "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" }, "time": "2023-09-26T02:20:38+00:00" }, @@ -950,16 +950,16 @@ }, { "name": "react/promise", - "version": "v3.1.0", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c" + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", - "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", "shasum": "" }, "require": { @@ -1011,7 +1011,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v3.1.0" + "source": "https://github.com/reactphp/promise/tree/v3.2.0" }, "funding": [ { @@ -1019,7 +1019,7 @@ "type": "open_collective" } ], - "time": "2023-11-16T16:21:57+00:00" + "time": "2024-05-24T10:39:05+00:00" }, { "name": "seld/jsonlint", @@ -1196,47 +1196,46 @@ }, { "name": "symfony/console", - "version": "v6.4.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" + "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", - "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", + "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0|^7.0" + "symfony/string": "^6.4|^7.0" }, "conflict": { - "symfony/dependency-injection": "<5.4", - "symfony/dotenv": "<5.4", - "symfony/event-dispatcher": "<5.4", - "symfony/lock": "<5.4", - "symfony/process": "<5.4" + "symfony/dependency-injection": "<6.4", + "symfony/dotenv": "<6.4", + "symfony/event-dispatcher": "<6.4", + "symfony/lock": "<6.4", + "symfony/process": "<6.4" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0", "symfony/http-foundation": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", - "symfony/lock": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/stopwatch": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" + "symfony/lock": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/stopwatch": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1270,7 +1269,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.7" + "source": "https://github.com/symfony/console/tree/v7.1.1" }, "funding": [ { @@ -1286,7 +1285,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1357,23 +1356,25 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4" + "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/78dde75f8f6dbbca4ec436a4b0087f7af02076d4", - "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2", + "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/process": "^5.4|^6.4" + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1401,7 +1402,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.7" + "source": "https://github.com/symfony/filesystem/tree/v7.1.1" }, "funding": [ { @@ -1417,27 +1418,27 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/finder", - "version": "v6.4.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "511c48990be17358c23bf45c5d71ab85d40fb764" + "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764", - "reference": "511c48990be17358c23bf45c5d71ab85d40fb764", + "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6", + "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "symfony/filesystem": "^6.0|^7.0" + "symfony/filesystem": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1465,7 +1466,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.7" + "source": "https://github.com/symfony/finder/tree/v7.1.1" }, "funding": [ { @@ -1481,25 +1482,24 @@ "type": "tidelift" } ], - "time": "2024-04-23T10:36:43+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/mime", - "version": "v6.4.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "decadcf3865918ecfcbfa90968553994ce935a5e" + "reference": "21027eaacc1a8a20f5e616c25c3580f5dd3a15df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/decadcf3865918ecfcbfa90968553994ce935a5e", - "reference": "decadcf3865918ecfcbfa90968553994ce935a5e", + "url": "https://api.github.com/repos/symfony/mime/zipball/21027eaacc1a8a20f5e616c25c3580f5dd3a15df", + "reference": "21027eaacc1a8a20f5e616c25c3580f5dd3a15df", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, @@ -1507,18 +1507,18 @@ "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<5.4", - "symfony/serializer": "<6.3.2" + "symfony/mailer": "<6.4", + "symfony/serializer": "<6.4.3|>7.0,<7.0.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "league/html-to-markdown": "^5.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.4|^7.0", - "symfony/property-access": "^5.4|^6.0|^7.0", - "symfony/property-info": "^5.4|^6.0|^7.0", - "symfony/serializer": "^6.3.2|^7.0" + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/property-access": "^6.4|^7.0", + "symfony/property-info": "^6.4|^7.0", + "symfony/serializer": "^6.4.3|^7.0.3" }, "type": "library", "autoload": { @@ -1550,7 +1550,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.7" + "source": "https://github.com/symfony/mime/tree/v7.1.1" }, "funding": [ { @@ -1566,7 +1566,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-06-04T06:40:14+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1972,20 +1972,20 @@ }, { "name": "symfony/process", - "version": "v6.4.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "cdb1c81c145fd5aa9b0038bab694035020943381" + "reference": "febf90124323a093c7ee06fdb30e765ca3c20028" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381", - "reference": "cdb1c81c145fd5aa9b0038bab694035020943381", + "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028", + "reference": "febf90124323a093c7ee06fdb30e765ca3c20028", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "autoload": { @@ -2013,7 +2013,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.7" + "source": "https://github.com/symfony/process/tree/v7.1.1" }, "funding": [ { @@ -2029,7 +2029,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/service-contracts", @@ -2116,20 +2116,20 @@ }, { "name": "symfony/string", - "version": "v6.4.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" + "reference": "60bc311c74e0af215101235aa6f471bcbc032df2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", - "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", + "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2", + "reference": "60bc311c74e0af215101235aa6f471bcbc032df2", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -2139,11 +2139,12 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0|^7.0", - "symfony/http-client": "^5.4|^6.0|^7.0", - "symfony/intl": "^6.2|^7.0", + "symfony/emoji": "^7.1", + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0|^7.0" + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -2182,7 +2183,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.7" + "source": "https://github.com/symfony/string/tree/v7.1.1" }, "funding": [ { @@ -2198,20 +2199,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-06-04T06:40:14+00:00" }, { "name": "twig/html-extra", - "version": "v3.9.0", + "version": "v3.10.0", "source": { "type": "git", "url": "https://github.com/twigphp/html-extra.git", - "reference": "8d8bf63a958bec84dbbf12d6c9958319bbaa2eea" + "reference": "1c045fc28ace0dcaf464f8e0d4e2aca6347d5fda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/html-extra/zipball/8d8bf63a958bec84dbbf12d6c9958319bbaa2eea", - "reference": "8d8bf63a958bec84dbbf12d6c9958319bbaa2eea", + "url": "https://api.github.com/repos/twigphp/html-extra/zipball/1c045fc28ace0dcaf464f8e0d4e2aca6347d5fda", + "reference": "1c045fc28ace0dcaf464f8e0d4e2aca6347d5fda", "shasum": "" }, "require": { @@ -2254,7 +2255,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/html-extra/tree/v3.9.0" + "source": "https://github.com/twigphp/html-extra/tree/v3.10.0" }, "funding": [ { @@ -2266,20 +2267,20 @@ "type": "tidelift" } ], - "time": "2024-02-10T08:52:03+00:00" + "time": "2024-05-11T07:35:57+00:00" }, { "name": "twig/twig", - "version": "v3.9.3", + "version": "v3.10.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58" + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", "shasum": "" }, "require": { @@ -2333,7 +2334,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.9.3" + "source": "https://github.com/twigphp/Twig/tree/v3.10.3" }, "funding": [ { @@ -2345,7 +2346,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T11:59:33+00:00" + "time": "2024-05-16T10:04:27+00:00" } ], "packages-dev": [], @@ -2360,8 +2361,8 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "8.1", + "php": "8.2", "ext-openssl": "0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } From 115f630895afda05ffdb291b28aa1378c4c6ab35 Mon Sep 17 00:00:00 2001 From: acoulton Date: Thu, 6 Jun 2024 10:53:13 +0100 Subject: [PATCH 2/2] Pin explicitly to satis 3.x to prevent it going backwards Otherwise if the 3.x branch adds dependencies which no longer support our platform, composer will rewind back to e.g. 2.x@dev or 1.x@dev to get a version that meets the constraints. --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 27a0d3a..8355606 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require": { - "composer/satis": "*@dev", + "composer/satis": "3.x@dev", "fitchlearning/satisfy": "dev-acoulton-master" }, "repositories": [ diff --git a/composer.lock b/composer.lock index 13c4977..4fcc863 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": "2d29c12c396153e8a9698d8db42fd255", + "content-hash": "f83a025407d284993a413a87ee7d1057", "packages": [ { "name": "composer/ca-bundle",