diff --git a/composer.json b/composer.json index 07cf61ec7d7e605739040a619ba41c3899c53581..d9c4ccc7e1bb4f98cb3cfc2c5c1cc8a2c3492560 100644 --- a/composer.json +++ b/composer.json @@ -27,16 +27,16 @@ "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8.11", - "symfony/css-selector": "^6.1", - "symfony/phpunit-bridge": "^6.1.2", - "symfony/var-dumper": "^6.1", - "symfony/error-handler": "^6.1", + "symfony/css-selector": "^6.2@beta", + "symfony/phpunit-bridge": "^6.2@beta", + "symfony/var-dumper": "^6.2@beta", + "symfony/error-handler": "^6.2@beta", "justinrainbow/json-schema": "^5.2", - "symfony/filesystem": "^6.1", - "symfony/finder": "^6.1", - "symfony/lock": "^6.1", - "symfony/browser-kit": "^6.1", - "symfony/dom-crawler": "^6.1" + "symfony/filesystem": "^6.2@beta", + "symfony/finder": "^6.2@beta", + "symfony/lock": "^6.2@beta", + "symfony/browser-kit": "^6.2@beta", + "symfony/dom-crawler": "^6.2@beta" }, "replace": { "symfony/polyfill-php72": "*", diff --git a/composer.lock b/composer.lock index 84b84ce62840307d914bfe2d22b8fff8002a7744..2e2e196d7f02875d7359e7f24ebcb35ea76f8fb8 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": "ea790cd29747985bd5b24ceccebfb38e", + "content-hash": "ef033ef4a1da6243f950b37a7e6b7267", "packages": [ { "name": "asm89/stack-cors", @@ -443,7 +443,7 @@ "dist": { "type": "path", "url": "core", - "reference": "a75d3d082c27d60cdb0c87f56e968c36538800e3" + "reference": "e44b58cbd2865cefffd4ec4739a2aa9ef7fc3e71" }, "require": { "asm89/stack-cors": "^2.1", @@ -469,19 +469,19 @@ "pear/archive_tar": "^1.4.14", "php": ">=8.1.0", "psr/log": "^3.0", - "symfony/console": "^6.1", - "symfony/dependency-injection": "^6.1", - "symfony/event-dispatcher": "^6.1", - "symfony/http-foundation": "^6.1.3", - "symfony/http-kernel": "^6.1", - "symfony/mime": "^6.1", + "symfony/console": "^6.2@beta", + "symfony/dependency-injection": "^6.2@beta", + "symfony/event-dispatcher": "^6.2@beta", + "symfony/http-foundation": "^6.2@beta", + "symfony/http-kernel": "^6.2@beta", + "symfony/mime": "^6.2@beta", "symfony/polyfill-iconv": "^1.26", - "symfony/process": "^6.1", + "symfony/process": "^6.2@beta", "symfony/psr-http-message-bridge": "^2.1", - "symfony/routing": "^6.1", - "symfony/serializer": "^6.1", - "symfony/validator": "^6.1", - "symfony/yaml": "^6.1", + "symfony/routing": "^6.2@beta", + "symfony/serializer": "^6.2@beta", + "symfony/validator": "^6.2@beta", + "symfony/yaml": "^6.2@beta", "twig/twig": "^3.4.3" }, "conflict": { @@ -1768,16 +1768,16 @@ }, { "name": "symfony/console", - "version": "v6.1.6", + "version": "v6.2.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7fa3b9cf17363468795e539231a5c91b02b608fc" + "reference": "b0acb1e8d7130c317a5cf655443b0b38a21d446d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7fa3b9cf17363468795e539231a5c91b02b608fc", - "reference": "7fa3b9cf17363468795e539231a5c91b02b608fc", + "url": "https://api.github.com/repos/symfony/console/zipball/b0acb1e8d7130c317a5cf655443b0b38a21d446d", + "reference": "b0acb1e8d7130c317a5cf655443b0b38a21d446d", "shasum": "" }, "require": { @@ -1844,7 +1844,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.1.6" + "source": "https://github.com/symfony/console/tree/v6.2.0-BETA2" }, "funding": [ { @@ -1860,33 +1860,34 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-10-26T21:44:56+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.1.5", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "b9c797c9d56afc290d4265854bafd01b4e379240" + "reference": "c10b2247414aa1c6e157f44ca093169319463892" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b9c797c9d56afc290d4265854bafd01b4e379240", - "reference": "b9c797c9d56afc290d4265854bafd01b4e379240", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c10b2247414aa1c6e157f44ca093169319463892", + "reference": "c10b2247414aa1c6e157f44ca093169319463892", "shasum": "" }, "require": { "php": ">=8.1", "psr/container": "^1.1|^2.0", "symfony/deprecation-contracts": "^2.1|^3", - "symfony/service-contracts": "^1.1.6|^2.0|^3.0" + "symfony/service-contracts": "^1.1.6|^2.0|^3.0", + "symfony/var-exporter": "^6.2" }, "conflict": { "ext-psr": "<1.1|>=2", "symfony/config": "<6.1", "symfony/finder": "<5.4", - "symfony/proxy-manager-bridge": "<5.4", + "symfony/proxy-manager-bridge": "<6.2", "symfony/yaml": "<5.4" }, "provide": { @@ -1931,7 +1932,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.1.5" + "source": "https://github.com/symfony/dependency-injection/tree/v6.2.0-BETA1" }, "funding": [ { @@ -1947,7 +1948,7 @@ "type": "tidelift" } ], - "time": "2022-09-28T16:00:52+00:00" + "time": "2022-10-24T12:22:51+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2018,16 +2019,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.1.6", + "version": "v6.2.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "49f718e41f1b6f0fd5730895ca5b1c37defd828d" + "reference": "b3bd2fd9b65e3a0b62c29fcd7c8351aab2482c1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/49f718e41f1b6f0fd5730895ca5b1c37defd828d", - "reference": "49f718e41f1b6f0fd5730895ca5b1c37defd828d", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/b3bd2fd9b65e3a0b62c29fcd7c8351aab2482c1e", + "reference": "b3bd2fd9b65e3a0b62c29fcd7c8351aab2482c1e", "shasum": "" }, "require": { @@ -2069,7 +2070,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.1.6" + "source": "https://github.com/symfony/error-handler/tree/v6.2.0-BETA2" }, "funding": [ { @@ -2085,20 +2086,20 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-10-28T16:24:13+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.1.0", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347" + "reference": "7e0b66a9f3b02a166140603af1b2253827c750fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a0449a7ad7daa0f7c0acd508259f80544ab5a347", - "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7e0b66a9f3b02a166140603af1b2253827c750fe", + "reference": "7e0b66a9f3b02a166140603af1b2253827c750fe", "shasum": "" }, "require": { @@ -2152,7 +2153,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.1.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.0-BETA1" }, "funding": [ { @@ -2168,7 +2169,7 @@ "type": "tidelift" } ], - "time": "2022-05-05T16:51:07+00:00" + "time": "2022-09-30T20:34:56+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2251,16 +2252,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.1.6", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "3ae8e9c57155fc48930493a629da293b32efbde0" + "reference": "e550bddd11e82eb8f7359a722196a49c92aa7f45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3ae8e9c57155fc48930493a629da293b32efbde0", - "reference": "3ae8e9c57155fc48930493a629da293b32efbde0", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e550bddd11e82eb8f7359a722196a49c92aa7f45", + "reference": "e550bddd11e82eb8f7359a722196a49c92aa7f45", "shasum": "" }, "require": { @@ -2268,6 +2269,9 @@ "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.1" }, + "conflict": { + "symfony/cache": "<6.2" + }, "require-dev": { "predis/predis": "~1.0", "symfony/cache": "^5.4|^6.0", @@ -2306,7 +2310,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.1.6" + "source": "https://github.com/symfony/http-foundation/tree/v6.2.0-BETA1" }, "funding": [ { @@ -2322,25 +2326,26 @@ "type": "tidelift" } ], - "time": "2022-10-02T08:30:52+00:00" + "time": "2022-10-12T09:45:39+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.1.6", + "version": "v6.2.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "102f99bf81799e93f61b9a73b2f38b309c587a94" + "reference": "9d6f10cd4c64aeb4b77c7e9b2744b43995c28d20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/102f99bf81799e93f61b9a73b2f38b309c587a94", - "reference": "102f99bf81799e93f61b9a73b2f38b309c587a94", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9d6f10cd4c64aeb4b77c7e9b2744b43995c28d20", + "reference": "9d6f10cd4c64aeb4b77c7e9b2744b43995c28d20", "shasum": "" }, "require": { "php": ">=8.1", "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/error-handler": "^6.1", "symfony/event-dispatcher": "^5.4|^6.0", "symfony/http-foundation": "^5.4|^6.0", @@ -2351,7 +2356,7 @@ "symfony/cache": "<5.4", "symfony/config": "<6.1", "symfony/console": "<5.4", - "symfony/dependency-injection": "<6.1", + "symfony/dependency-injection": "<6.2", "symfony/doctrine-bridge": "<5.4", "symfony/form": "<5.4", "symfony/http-client": "<5.4", @@ -2371,7 +2376,7 @@ "symfony/config": "^6.1", "symfony/console": "^5.4|^6.0", "symfony/css-selector": "^5.4|^6.0", - "symfony/dependency-injection": "^6.1", + "symfony/dependency-injection": "^6.2", "symfony/dom-crawler": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", "symfony/finder": "^5.4|^6.0", @@ -2416,7 +2421,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.1.6" + "source": "https://github.com/symfony/http-kernel/tree/v6.2.0-BETA2" }, "funding": [ { @@ -2432,20 +2437,20 @@ "type": "tidelift" } ], - "time": "2022-10-12T07:48:47+00:00" + "time": "2022-10-28T18:21:11+00:00" }, { "name": "symfony/mime", - "version": "v6.1.6", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "5ae192b9a39730435cfec025a499f79d05ac68a3" + "reference": "877a042802953e4be7d2b9e171ffde791f3e2ce8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/5ae192b9a39730435cfec025a499f79d05ac68a3", - "reference": "5ae192b9a39730435cfec025a499f79d05ac68a3", + "url": "https://api.github.com/repos/symfony/mime/zipball/877a042802953e4be7d2b9e171ffde791f3e2ce8", + "reference": "877a042802953e4be7d2b9e171ffde791f3e2ce8", "shasum": "" }, "require": { @@ -2458,15 +2463,16 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<5.4", - "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" + "symfony/serializer": "<6.2" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1", + "league/html-to-markdown": "^5.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^5.4|^6.0", "symfony/property-access": "^5.4|^6.0", "symfony/property-info": "^5.4|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" + "symfony/serializer": "^6.2" }, "type": "library", "autoload": { @@ -2498,7 +2504,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.1.6" + "source": "https://github.com/symfony/mime/tree/v6.2.0-BETA1" }, "funding": [ { @@ -2514,7 +2520,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-10-19T08:20:14+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3018,16 +3024,16 @@ }, { "name": "symfony/process", - "version": "v6.1.3", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292" + "reference": "00db88f2b2c541c5c61e05056d9d18eaa11493a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/a6506e99cfad7059b1ab5cab395854a0a0c21292", - "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292", + "url": "https://api.github.com/repos/symfony/process/zipball/00db88f2b2c541c5c61e05056d9d18eaa11493a9", + "reference": "00db88f2b2c541c5c61e05056d9d18eaa11493a9", "shasum": "" }, "require": { @@ -3059,7 +3065,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.1.3" + "source": "https://github.com/symfony/process/tree/v6.2.0-BETA1" }, "funding": [ { @@ -3075,7 +3081,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T17:24:16+00:00" + "time": "2022-08-25T15:27:04+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -3167,16 +3173,16 @@ }, { "name": "symfony/routing", - "version": "v6.1.5", + "version": "v6.2.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "f8c1ebb43d0f39e5ecd12a732ba1952a3dd8455c" + "reference": "0cfffe1fb6f8419c75f21332b438ee5f1a142853" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f8c1ebb43d0f39e5ecd12a732ba1952a3dd8455c", - "reference": "f8c1ebb43d0f39e5ecd12a732ba1952a3dd8455c", + "url": "https://api.github.com/repos/symfony/routing/zipball/0cfffe1fb6f8419c75f21332b438ee5f1a142853", + "reference": "0cfffe1fb6f8419c75f21332b438ee5f1a142853", "shasum": "" }, "require": { @@ -3184,14 +3190,14 @@ }, "conflict": { "doctrine/annotations": "<1.12", - "symfony/config": "<5.4", + "symfony/config": "<6.2", "symfony/dependency-injection": "<5.4", "symfony/yaml": "<5.4" }, "require-dev": { "doctrine/annotations": "^1.12", "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", + "symfony/config": "^6.2", "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", "symfony/http-foundation": "^5.4|^6.0", @@ -3235,7 +3241,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.1.5" + "source": "https://github.com/symfony/routing/tree/v6.2.0-BETA2" }, "funding": [ { @@ -3251,20 +3257,20 @@ "type": "tidelift" } ], - "time": "2022-09-09T09:26:14+00:00" + "time": "2022-10-26T22:15:37+00:00" }, { "name": "symfony/serializer", - "version": "v6.1.6", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "76af774da9daf606d6400f1445b69d23efa3b238" + "reference": "f22044db3f3ec161584fe72c07dbefa626563db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/76af774da9daf606d6400f1445b69d23efa3b238", - "reference": "76af774da9daf606d6400f1445b69d23efa3b238", + "url": "https://api.github.com/repos/symfony/serializer/zipball/f22044db3f3ec161584fe72c07dbefa626563db5", + "reference": "f22044db3f3ec161584fe72c07dbefa626563db5", "shasum": "" }, "require": { @@ -3336,7 +3342,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.1.6" + "source": "https://github.com/symfony/serializer/tree/v6.2.0-BETA1" }, "funding": [ { @@ -3352,7 +3358,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T05:10:31+00:00" + "time": "2022-10-22T13:18:44+00:00" }, { "name": "symfony/service-contracts", @@ -3441,16 +3447,16 @@ }, { "name": "symfony/string", - "version": "v6.1.6", + "version": "v6.1.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864" + "reference": "823f143370880efcbdfa2dbca946b3358c4707e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7e7e0ff180d4c5a6636eaad57b65092014b61864", - "reference": "7e7e0ff180d4c5a6636eaad57b65092014b61864", + "url": "https://api.github.com/repos/symfony/string/zipball/823f143370880efcbdfa2dbca946b3358c4707e5", + "reference": "823f143370880efcbdfa2dbca946b3358c4707e5", "shasum": "" }, "require": { @@ -3506,7 +3512,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.6" + "source": "https://github.com/symfony/string/tree/v6.1.7" }, "funding": [ { @@ -3607,16 +3613,16 @@ }, { "name": "symfony/validator", - "version": "v6.1.6", + "version": "v6.2.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "e5589882403e1e19774d7c5ffb65d9c6466d216c" + "reference": "e042240cd30960cba640f3157395b07768aa7355" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/e5589882403e1e19774d7c5ffb65d9c6466d216c", - "reference": "e5589882403e1e19774d7c5ffb65d9c6466d216c", + "url": "https://api.github.com/repos/symfony/validator/zipball/e042240cd30960cba640f3157395b07768aa7355", + "reference": "e042240cd30960cba640f3157395b07768aa7355", "shasum": "" }, "require": { @@ -3695,7 +3701,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.1.6" + "source": "https://github.com/symfony/validator/tree/v6.2.0-BETA2" }, "funding": [ { @@ -3711,20 +3717,20 @@ "type": "tidelift" } ], - "time": "2022-10-02T08:30:52+00:00" + "time": "2022-10-28T16:24:13+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.1.6", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0f0adde127f24548e23cbde83bcaeadc491c551f" + "reference": "9e14f552a46cc5a523b734417fa81dfaed7600e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0f0adde127f24548e23cbde83bcaeadc491c551f", - "reference": "0f0adde127f24548e23cbde83bcaeadc491c551f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9e14f552a46cc5a523b734417fa81dfaed7600e2", + "reference": "9e14f552a46cc5a523b734417fa81dfaed7600e2", "shasum": "" }, "require": { @@ -3783,7 +3789,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.1.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.2.0-BETA1" }, "funding": [ { @@ -3799,20 +3805,94 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-10-09T08:55:43+00:00" + }, + { + "name": "symfony/var-exporter", + "version": "v6.2.0-BETA1", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-exporter.git", + "reference": "e6151f9f2d5231e72b870319209b4f1ba2c31ac5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/e6151f9f2d5231e72b870319209b4f1ba2c31ac5", + "reference": "e6151f9f2d5231e72b870319209b4f1ba2c31ac5", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "symfony/var-dumper": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy loading", + "proxy", + "serialize" + ], + "support": { + "source": "https://github.com/symfony/var-exporter/tree/v6.2.0-BETA1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-10-02T10:37:55+00:00" }, { "name": "symfony/yaml", - "version": "v6.1.6", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "66c6b0cf52b00f74614a2cf7ae7db08ea1095931" + "reference": "b5fbe4feba6891de7ec1393b0282b13401a74049" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/66c6b0cf52b00f74614a2cf7ae7db08ea1095931", - "reference": "66c6b0cf52b00f74614a2cf7ae7db08ea1095931", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b5fbe4feba6891de7ec1393b0282b13401a74049", + "reference": "b5fbe4feba6891de7ec1393b0282b13401a74049", "shasum": "" }, "require": { @@ -3857,7 +3937,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.1.6" + "source": "https://github.com/symfony/yaml/tree/v6.2.0-BETA1" }, "funding": [ { @@ -3873,7 +3953,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-10-09T08:55:43+00:00" }, { "name": "twig/twig", @@ -7647,16 +7727,16 @@ }, { "name": "symfony/browser-kit", - "version": "v6.1.3", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "2e3b6a4406c2af963c634d7bd0457402b67dcc56" + "reference": "1a481596aa37d6aee547272d1df86505b0ecf805" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2e3b6a4406c2af963c634d7bd0457402b67dcc56", - "reference": "2e3b6a4406c2af963c634d7bd0457402b67dcc56", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/1a481596aa37d6aee547272d1df86505b0ecf805", + "reference": "1a481596aa37d6aee547272d1df86505b0ecf805", "shasum": "" }, "require": { @@ -7698,7 +7778,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.1.3" + "source": "https://github.com/symfony/browser-kit/tree/v6.2.0-BETA1" }, "funding": [ { @@ -7714,20 +7794,20 @@ "type": "tidelift" } ], - "time": "2022-07-27T15:50:51+00:00" + "time": "2022-10-09T08:55:40+00:00" }, { "name": "symfony/css-selector", - "version": "v6.1.3", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "0dd5e36b80e1de97f8f74ed7023ac2b837a36443" + "reference": "91c342ffc99283c43653ed8eb47bc2a94db7f398" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/0dd5e36b80e1de97f8f74ed7023ac2b837a36443", - "reference": "0dd5e36b80e1de97f8f74ed7023ac2b837a36443", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/91c342ffc99283c43653ed8eb47bc2a94db7f398", + "reference": "91c342ffc99283c43653ed8eb47bc2a94db7f398", "shasum": "" }, "require": { @@ -7763,7 +7843,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.1.3" + "source": "https://github.com/symfony/css-selector/tree/v6.2.0-BETA1" }, "funding": [ { @@ -7779,20 +7859,20 @@ "type": "tidelift" } ], - "time": "2022-06-27T17:24:16+00:00" + "time": "2022-08-26T05:51:22+00:00" }, { "name": "symfony/dom-crawler", - "version": "v6.1.4", + "version": "v6.2.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "8cb4c6e6c8d30c26f70529ed5e50d79a09576c0c" + "reference": "6816beab70c726bc2ed2f125fdf3dda0394a0464" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8cb4c6e6c8d30c26f70529ed5e50d79a09576c0c", - "reference": "8cb4c6e6c8d30c26f70529ed5e50d79a09576c0c", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/6816beab70c726bc2ed2f125fdf3dda0394a0464", + "reference": "6816beab70c726bc2ed2f125fdf3dda0394a0464", "shasum": "" }, "require": { @@ -7833,7 +7913,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.1.4" + "source": "https://github.com/symfony/dom-crawler/tree/v6.2.0-BETA2" }, "funding": [ { @@ -7849,20 +7929,20 @@ "type": "tidelift" } ], - "time": "2022-08-04T19:19:00+00:00" + "time": "2022-10-28T16:24:13+00:00" }, { "name": "symfony/filesystem", - "version": "v6.1.5", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4d216a2beef096edf040a070117c39ca2abce307" + "reference": "ccff5f36c85e6b4cf8a1be196273f06dd87930bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d216a2beef096edf040a070117c39ca2abce307", - "reference": "4d216a2beef096edf040a070117c39ca2abce307", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/ccff5f36c85e6b4cf8a1be196273f06dd87930bd", + "reference": "ccff5f36c85e6b4cf8a1be196273f06dd87930bd", "shasum": "" }, "require": { @@ -7896,7 +7976,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.1.5" + "source": "https://github.com/symfony/filesystem/tree/v6.2.0-BETA1" }, "funding": [ { @@ -7912,20 +7992,20 @@ "type": "tidelift" } ], - "time": "2022-09-21T20:29:40+00:00" + "time": "2022-09-21T20:30:19+00:00" }, { "name": "symfony/finder", - "version": "v6.1.3", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709" + "reference": "eb2355f69519e4ef33f1835bca4c935f5d42e570" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709", + "url": "https://api.github.com/repos/symfony/finder/zipball/eb2355f69519e4ef33f1835bca4c935f5d42e570", + "reference": "eb2355f69519e4ef33f1835bca4c935f5d42e570", "shasum": "" }, "require": { @@ -7960,7 +8040,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.1.3" + "source": "https://github.com/symfony/finder/tree/v6.2.0-BETA1" }, "funding": [ { @@ -7976,20 +8056,20 @@ "type": "tidelift" } ], - "time": "2022-07-29T07:42:06+00:00" + "time": "2022-10-09T08:55:40+00:00" }, { "name": "symfony/lock", - "version": "v6.1.3", + "version": "v6.2.0-BETA2", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "6e8c324132f8ebb47a1a8506031a55f0020783fc" + "reference": "a6d9dd0b15827034150d214d20983ed7e889e4c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/6e8c324132f8ebb47a1a8506031a55f0020783fc", - "reference": "6e8c324132f8ebb47a1a8506031a55f0020783fc", + "url": "https://api.github.com/repos/symfony/lock/zipball/a6d9dd0b15827034150d214d20983ed7e889e4c3", + "reference": "a6d9dd0b15827034150d214d20983ed7e889e4c3", "shasum": "" }, "require": { @@ -7997,7 +8077,8 @@ "psr/log": "^1|^2|^3" }, "conflict": { - "doctrine/dbal": "<2.13" + "doctrine/dbal": "<2.13", + "symfony/cache": "<6.2" }, "require-dev": { "doctrine/dbal": "^2.13|^3.0", @@ -8037,7 +8118,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.1.3" + "source": "https://github.com/symfony/lock/tree/v6.2.0-BETA2" }, "funding": [ { @@ -8053,20 +8134,20 @@ "type": "tidelift" } ], - "time": "2022-06-27T17:24:16+00:00" + "time": "2022-10-28T16:24:13+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v6.1.6", + "version": "v6.2.0-BETA1", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "07cf788ac9ae83b59d46599bb5098c3add88c68b" + "reference": "458475eb9d09a3b1974bc2dbf3a1432a43ac2eda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/07cf788ac9ae83b59d46599bb5098c3add88c68b", - "reference": "07cf788ac9ae83b59d46599bb5098c3add88c68b", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/458475eb9d09a3b1974bc2dbf3a1432a43ac2eda", + "reference": "458475eb9d09a3b1974bc2dbf3a1432a43ac2eda", "shasum": "" }, "require": { @@ -8120,7 +8201,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.1.6" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.2.0-BETA1" }, "funding": [ { @@ -8136,7 +8217,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2022-10-07T08:04:14+00:00" }, { "name": "theseer/tokenizer", @@ -8296,7 +8377,16 @@ "stability-flags": { "drupal/core": 20, "drupal/core-project-message": 20, - "drupal/core-vendor-hardening": 20 + "drupal/core-vendor-hardening": 20, + "symfony/css-selector": 10, + "symfony/phpunit-bridge": 10, + "symfony/var-dumper": 10, + "symfony/error-handler": 10, + "symfony/filesystem": 10, + "symfony/finder": 10, + "symfony/lock": 10, + "symfony/browser-kit": 10, + "symfony/dom-crawler": 10 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index ffd542763ca893118af6424e5dbd40de00f6ff7f..0bbc27340ce8efe2f9c2eef8b78728faa77700e5 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -29,31 +29,32 @@ "psr/http-message": "~1.0.1", "psr/log": "~3.0.0", "ralouphie/getallheaders": "~3.0.3", - "symfony/console": "~v6.1.6", - "symfony/dependency-injection": "~v6.1.5", + "symfony/console": "~v6.2.0-BETA2", + "symfony/dependency-injection": "~v6.2.0-BETA1", "symfony/deprecation-contracts": "~v3.1.1", - "symfony/error-handler": "~v6.1.6", - "symfony/event-dispatcher": "~v6.1.0", + "symfony/error-handler": "~v6.2.0-BETA2", + "symfony/event-dispatcher": "~v6.2.0-BETA1", "symfony/event-dispatcher-contracts": "~v3.1.1", - "symfony/http-foundation": "~v6.1.6", - "symfony/http-kernel": "~v6.1.6", - "symfony/mime": "~v6.1.6", + "symfony/http-foundation": "~v6.2.0-BETA1", + "symfony/http-kernel": "~v6.2.0-BETA2", + "symfony/mime": "~v6.2.0-BETA1", "symfony/polyfill-ctype": "~v1.26.0", "symfony/polyfill-iconv": "~v1.26.0", "symfony/polyfill-intl-grapheme": "~v1.26.0", "symfony/polyfill-intl-idn": "~v1.26.0", "symfony/polyfill-intl-normalizer": "~v1.26.0", "symfony/polyfill-mbstring": "~v1.26.0", - "symfony/process": "~v6.1.3", + "symfony/process": "~v6.2.0-BETA1", "symfony/psr-http-message-bridge": "~v2.1.3", - "symfony/routing": "~v6.1.5", - "symfony/serializer": "~v6.1.6", + "symfony/routing": "~v6.2.0-BETA2", + "symfony/serializer": "~v6.2.0-BETA1", "symfony/service-contracts": "~v3.1.1", - "symfony/string": "~v6.1.6", + "symfony/string": "~v6.1.7", "symfony/translation-contracts": "~v3.1.1", - "symfony/validator": "~v6.1.6", - "symfony/var-dumper": "~v6.1.6", - "symfony/yaml": "~v6.1.6", + "symfony/validator": "~v6.2.0-BETA2", + "symfony/var-dumper": "~v6.2.0-BETA1", + "symfony/var-exporter": "~v6.2.0-BETA1", + "symfony/yaml": "~v6.2.0-BETA1", "twig/twig": "~v3.4.3" } } diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json index 85aa7896fc9bd885024a932e5b0b1b7d1e6e00d8..f19961dc8d5636b2faa61fa66ae0121ca2d61ba6 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json @@ -20,14 +20,14 @@ "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8.11", "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^6.1", - "symfony/css-selector": "^6.1", - "symfony/dom-crawler": "^6.1", - "symfony/error-handler": "^6.1", - "symfony/filesystem": "^6.1", - "symfony/finder": "^6.1", - "symfony/lock": "^6.1", - "symfony/phpunit-bridge": "^6.1.2", - "symfony/var-dumper": "^6.1" + "symfony/browser-kit": "^6.2@beta", + "symfony/css-selector": "^6.2@beta", + "symfony/dom-crawler": "^6.2@beta", + "symfony/error-handler": "^6.2@beta", + "symfony/filesystem": "^6.2@beta", + "symfony/finder": "^6.2@beta", + "symfony/lock": "^6.2@beta", + "symfony/phpunit-bridge": "^6.2@beta", + "symfony/var-dumper": "^6.2@beta" } } diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index b02aec3a7d16d5305041791658fd148058d2f70d..77dee0fb8a72a260985160d6d8b8325471b2b3c7 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -66,13 +66,13 @@ "sirbrillig/phpcs-variable-analysis": "v2.11.9", "slevomat/coding-standard": "8.6.2", "squizlabs/php_codesniffer": "3.7.1", - "symfony/browser-kit": "v6.1.3", - "symfony/css-selector": "v6.1.3", - "symfony/dom-crawler": "v6.1.4", - "symfony/filesystem": "v6.1.5", - "symfony/finder": "v6.1.3", - "symfony/lock": "v6.1.3", - "symfony/phpunit-bridge": "v6.1.6", + "symfony/browser-kit": "v6.2.0-BETA1", + "symfony/css-selector": "v6.2.0-BETA1", + "symfony/dom-crawler": "v6.2.0-BETA2", + "symfony/filesystem": "v6.2.0-BETA1", + "symfony/finder": "v6.2.0-BETA1", + "symfony/lock": "v6.2.0-BETA2", + "symfony/phpunit-bridge": "v6.2.0-BETA1", "theseer/tokenizer": "1.2.1", "webflo/drupal-finder": "1.2.2", "webmozart/assert": "1.11.0" diff --git a/core/.deprecation-ignore.txt b/core/.deprecation-ignore.txt index 791ff7f8a6ef0fd0efc3c9ddad8d5d584dd3ab25..a293efe4d00b0debd62fc1d4eabb5d123c32dafb 100644 --- a/core/.deprecation-ignore.txt +++ b/core/.deprecation-ignore.txt @@ -21,4 +21,3 @@ %"PHPUnit\\Framework\\TestListenerDefaultImplementation".*is deprecated% %"PHPUnit\\Framework\\TestSuite".*is considered internal% %"PHPUnit\\TextUI\\DefaultResultPrinter".*is considered internal% - diff --git a/core/composer.json b/core/composer.json index 47e5279b123c039257f687e5a1a79a27f72ebe3a..6d7a4e38295b555370d8aba7bd4ad4eb25901786 100644 --- a/core/composer.json +++ b/core/composer.json @@ -18,18 +18,18 @@ "ext-tokenizer": "*", "ext-xml": "*", "php": ">=8.1.0", - "symfony/console": "^6.1", - "symfony/dependency-injection": "^6.1", - "symfony/event-dispatcher": "^6.1", - "symfony/http-foundation": "^6.1.3", - "symfony/http-kernel": "^6.1", - "symfony/mime": "^6.1", - "symfony/routing": "^6.1", - "symfony/serializer": "^6.1", - "symfony/validator": "^6.1", - "symfony/process": "^6.1", + "symfony/console": "^6.2@beta", + "symfony/dependency-injection": "^6.2@beta", + "symfony/event-dispatcher": "^6.2@beta", + "symfony/http-foundation": "^6.2@beta", + "symfony/http-kernel": "^6.2@beta", + "symfony/mime": "^6.2@beta", + "symfony/routing": "^6.2@beta", + "symfony/serializer": "^6.2@beta", + "symfony/validator": "^6.2@beta", + "symfony/process": "^6.2@beta", "symfony/polyfill-iconv": "^1.26", - "symfony/yaml": "^6.1", + "symfony/yaml": "^6.2@beta", "twig/twig": "^3.4.3", "doctrine/annotations": "^1.13", "guzzlehttp/guzzle": "^7.5", diff --git a/core/core.services.yml b/core/core.services.yml index 6b972c88d4ae479ee90a3cca310463dd56084964..d8a4a5b94e45aafded5adea3818282802a5dc6ad 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -743,7 +743,7 @@ services: class: Drupal\Core\StackMiddleware\StackedHttpKernel http_kernel.basic: class: Symfony\Component\HttpKernel\HttpKernel - arguments: ['@event_dispatcher', '@controller_resolver', '@request_stack', '@http_kernel.controller.argument_resolver', true] + arguments: ['@event_dispatcher', '@controller_resolver', '@request_stack', '@http_kernel.controller.argument_resolver', false] http_kernel.controller.argument_resolver: class: Symfony\Component\HttpKernel\Controller\ArgumentResolver arguments: ['@http_kernel.controller.argument_metadata_factory', ['@argument_resolver.request_attribute', '@argument_resolver.request', '@argument_resolver.psr7_request', '@argument_resolver.route_match', '@argument_resolver.default']] diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json index 0f3fcfaffb1d40239b0ba0623581d9ef8f01d113..59235e5de501eb7cf2d1f57bfdf837adf669400f 100644 --- a/core/lib/Drupal/Component/DependencyInjection/composer.json +++ b/core/lib/Drupal/Component/DependencyInjection/composer.json @@ -14,7 +14,7 @@ }, "require": { "php": ">=8.1.0", - "symfony/dependency-injection": "^6.1", + "symfony/dependency-injection": "^6.2@beta", "symfony/service-contracts": "v3.1.1" }, "suggest": { @@ -29,5 +29,6 @@ "_readme": [ "This file was partially generated automatically. See: https://www.drupal.org/node/3293830" ] - } + }, + "minimum-stability": "beta" } diff --git a/core/lib/Drupal/Component/EventDispatcher/composer.json b/core/lib/Drupal/Component/EventDispatcher/composer.json index c373f32404206d52dc48d31a11bd847eb2a207f8..98890cca7dd54fe52b44d936c7eaaa2c9826e722 100644 --- a/core/lib/Drupal/Component/EventDispatcher/composer.json +++ b/core/lib/Drupal/Component/EventDispatcher/composer.json @@ -8,8 +8,8 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.1.0", - "symfony/dependency-injection": "^6.1", - "symfony/event-dispatcher": "^6.1", + "symfony/dependency-injection": "^6.2@beta", + "symfony/event-dispatcher": "^6.2@beta", "symfony/event-dispatcher-contracts": "v3.1.1" }, "autoload": { @@ -21,5 +21,6 @@ "_readme": [ "This file was partially generated automatically. See: https://www.drupal.org/node/3293830" ] - } + }, + "minimum-stability": "beta" } diff --git a/core/lib/Drupal/Component/HttpFoundation/composer.json b/core/lib/Drupal/Component/HttpFoundation/composer.json index 74c903b2ae9903e2fbf28d333e6185b0671213a3..527736478127a24e525bf60f5a475f51eabde0c5 100644 --- a/core/lib/Drupal/Component/HttpFoundation/composer.json +++ b/core/lib/Drupal/Component/HttpFoundation/composer.json @@ -8,7 +8,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.1.0", - "symfony/http-foundation": "^6.1.3" + "symfony/http-foundation": "^6.2@beta" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Plugin/composer.json b/core/lib/Drupal/Component/Plugin/composer.json index 6f4cdbae6425fbf36b5462f9452aa3d12227c877..7102f0953e50872b33fb9082f0db438bddb4363b 100644 --- a/core/lib/Drupal/Component/Plugin/composer.json +++ b/core/lib/Drupal/Component/Plugin/composer.json @@ -10,7 +10,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.1.0", - "symfony/validator": "^6.1" + "symfony/validator": "^6.2@beta" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Component/Serialization/composer.json b/core/lib/Drupal/Component/Serialization/composer.json index 52fb12a5d2ae62f54614cc23334573d33dc972e0..67f2798921c55d07d168963c7bef9a0fcc684010 100644 --- a/core/lib/Drupal/Component/Serialization/composer.json +++ b/core/lib/Drupal/Component/Serialization/composer.json @@ -8,7 +8,7 @@ "license": "GPL-2.0-or-later", "require": { "php": ">=8.1.0", - "symfony/yaml": "^6.1" + "symfony/yaml": "^6.2@beta" }, "autoload": { "psr-4": { diff --git a/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php b/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php index 0578d7159725f8e03a08a3aa66fb3174f80379dc..11b7285fdbd117090440348f91b65cf8c44b16fa 100644 --- a/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php +++ b/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php @@ -6,12 +6,13 @@ use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface; +use Symfony\Component\HttpKernel\Controller\ValueResolverInterface; use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; /** * Yields a PSR7 request object based on the request object passed along. */ -final class Psr7RequestValueResolver implements ArgumentValueResolverInterface { +final class Psr7RequestValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface { /** * The PSR-7 converter. @@ -40,8 +41,8 @@ public function supports(Request $request, ArgumentMetadata $argument): bool { /** * {@inheritdoc} */ - public function resolve(Request $request, ArgumentMetadata $argument): iterable { - yield $this->httpMessageFactory->createRequest($request); + public function resolve(Request $request, ArgumentMetadata $argument): array { + return $argument->getType() === ServerRequestInterface::class ? [$this->httpMessageFactory->createRequest($request)] : []; } } diff --git a/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php b/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php index f81750279f599a578e3705a5da0719bc67bcd37c..51c460e095e6dcfe33dea2c10fc334b11f5362fc 100644 --- a/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php +++ b/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php @@ -6,12 +6,13 @@ use Drupal\Core\Routing\RouteMatchInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface; +use Symfony\Component\HttpKernel\Controller\ValueResolverInterface; use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; /** * Yields a RouteMatch object based on the request object passed along. */ -final class RouteMatchValueResolver implements ArgumentValueResolverInterface { +final class RouteMatchValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface { /** * {@inheritdoc} @@ -23,8 +24,8 @@ public function supports(Request $request, ArgumentMetadata $argument): bool { /** * {@inheritdoc} */ - public function resolve(Request $request, ArgumentMetadata $argument): iterable { - yield RouteMatch::createFromRequest($request); + public function resolve(Request $request, ArgumentMetadata $argument): array { + return $argument->getType() === RouteMatchInterface::class || is_subclass_of($argument->getType(), RouteMatchInterface::class) ? [RouteMatch::createFromRequest($request)] : []; } } diff --git a/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php b/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php index beb988f6ebe329e84b2ddee621b01702a5aee840..522cc8d2791d6abb42e5c03b59467a24b6a15064 100644 --- a/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php +++ b/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php @@ -22,7 +22,7 @@ public function filter(RouteCollection $collection, Request $request) { return $collection; } - $format = $request->getContentType(); + $format = $request->getContentTypeFormat(); foreach ($collection as $name => $route) { $supported_formats = array_filter(explode('|', $route->getRequirement('_content_type_format') ?? '')); diff --git a/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php b/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php index 2fe460fce393dee63d96648153e74f9709570a1c..02330d2c636aa66cecf68e74ea7f014df29d0f10 100644 --- a/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php +++ b/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php @@ -100,7 +100,7 @@ public function getResponseFormat(RouteMatchInterface $route_match, Request $req $acceptable_formats = $request->isMethodCacheable() ? $acceptable_response_formats : $acceptable_request_formats; $requested_format = $request->getRequestFormat(); - $content_type_format = $request->getContentType(); + $content_type_format = $request->getContentTypeFormat(); // If an acceptable response format is requested, then use that. Otherwise, // including and particularly when the client forgot to specify a response diff --git a/core/modules/rest/src/RequestHandler.php b/core/modules/rest/src/RequestHandler.php index e2bb7a9322dcb9caee89aee3fc4de05287692a55..a435e3ef0cc33ba851fdc594cfb67c1442c83900 100644 --- a/core/modules/rest/src/RequestHandler.php +++ b/core/modules/rest/src/RequestHandler.php @@ -158,7 +158,7 @@ protected function deserialize(RouteMatchInterface $route_match, Request $reques $unserialized = NULL; if (!empty($received)) { $method = static::getNormalizedRequestMethod($route_match); - $format = $request->getContentType(); + $format = $request->getContentTypeFormat(); $definition = $resource->getPluginDefinition(); diff --git a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php index 413b4d25cdf0ccf77eb4b40edac44c4b5fa1e380..4faf4c72c967f7cc43aa17e7039c3be64408bccb 100644 --- a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php +++ b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php @@ -32,7 +32,7 @@ class ComposerProjectTemplatesTest extends ComposerBuildTestBase { * * @see https://getcomposer.org/doc/04-schema.md#minimum-stability */ - protected const MINIMUM_STABILITY = 'stable'; + protected const MINIMUM_STABILITY = 'beta'; /** * The order of stability strings from least stable to most stable.