Skip to content

Commit

Permalink
partial upgrade to symfony 7
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobinDev
RobinDev committed Dec 4, 2023
1 parent e132942 commit b44eea0
Show file tree
Hide file tree
Showing 14 changed files with 131 additions and 96 deletions.
47 changes: 23 additions & 24 deletions composer.json
View file
Expand Up @@ -35,32 +35,31 @@
"piedweb/curl": "@dev || ^0.1",
"piedweb/extractor": "@dev || ^0.1.19",
"piedweb/linksimprover": "^0.0.8",
"piedweb/render-html-attributes": "^2.0.1",
"piedweb/render-html-attributes": "^2.0.6",
"sonata-project/admin-bundle": "^4.0",
"sonata-project/doctrine-orm-admin-bundle": "^4.9",
"spatie/image-optimizer": "^1.3",
"spatie/yaml-front-matter": "^2.0",
"symfony/asset": "^6.4",
"symfony/cache": "^6.4",
"symfony/console": "^6.4",
"symfony/expression-language": "^6.4",
"symfony/finder": "^6.4",
"symfony/form": "^6.4",
"symfony/framework-bundle": "^6.4",
"symfony/lock": "^6.4",
"symfony/mailer": "^6.4",
"symfony/asset": "^6.4|^7.0",
"symfony/cache": "^6.4|^7.0",
"symfony/console": "^6.4|^7.0",
"symfony/expression-language": "^6.4|^7.0",
"symfony/finder": "^6.4|^7.0",
"symfony/form": "^6.4|^7.0",
"symfony/framework-bundle": "^6.4|^7.0",
"symfony/lock": "^6.4|^7.0",
"symfony/mailer": "^6.4|^7.0",
"symfony/monolog-bundle": "^3.7",
"symfony/process": "^6.4",
"symfony/security-bundle": "^6.4",
"symfony/security-csrf": "^6.4",
"symfony/security-guard": "^5.4",
"symfony/serializer": "^6.4",
"symfony/translation": "^6.4",
"symfony/twig-bundle": "^6.4",
"symfony/validator": "^6.4",
"symfony/web-link": "^6.4",
"symfony/process": "^6.4|^7.0",
"symfony/security-bundle": "^6.4|^7.0",
"symfony/security-csrf": "^6.4|^7.0",
"symfony/serializer": "^6.4|^7.0",
"symfony/translation": "^6.4|^7.0",
"symfony/twig-bundle": "^6.4|^7.0",
"symfony/validator": "^6.4|^7.0",
"symfony/web-link": "^6.4|^7.0",
"symfony/webpack-encore-bundle": "^2.0",
"symfony/yaml": "^6.4",
"symfony/yaml": "^6.4|^7.0",
"thecodingmachine/safe": "^2.2",
"twig/intl-extra": "^3.2",
"vich/uploader-bundle": "^2.0",
Expand All @@ -73,15 +72,15 @@
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-doctrine": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^10.5",
"psalm/plugin-symfony": "^5.0",
"rector/rector": "^0.18",
"squizlabs/php_codesniffer": "^3.5",
"symfony/debug-bundle": "^6.4",
"symfony/dotenv": "^6.4",
"symfony/debug-bundle": "^6.4|^7.0",
"symfony/dotenv": "^6.4|^7.0",
"symfony/maker-bundle": "^1.35",
"symfony/panther": "^1 || ^2.0",
"symfony/phpunit-bridge": "^6.1",
"symfony/phpunit-bridge": "^6.4|^7.0",
"symfony/profiler-pack": "^1.0",
"symplify/config-transformer": "^12.1",
"symplify/monorepo-builder": "^11.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-block-editor-tools/package.json
View file
Expand Up @@ -29,7 +29,7 @@
"babel-loader": "^9.1",
"browserslist": "^4.22",
"caniuse-lite": "^1",
"cross-env": "^7.0.3",
"cross-env": "^6.4|^7.0.3",
"css-loader": "^6.5",
"editorjs-hyperlink": "https://github.com/trinhtam/editorjs-hyperlink.git",
"postcss": "^8.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-block-editor/package.json
View file
Expand Up @@ -25,7 +25,7 @@
"editorjs-undo": "^2",
"postcss": "^8.4",
"postcss-import": "^15.0",
"postcss-loader": "^7.0",
"postcss-loader": "^6.4|^7.0",
"postcss-nested": "^6.0",
"postcss-nested-ancestors": "^3.0",
"sass": "^1.56",
Expand Down
6 changes: 1 addition & 5 deletions packages/admin/src/Menu/PageMenuProvider.php
View file
Expand Up @@ -7,19 +7,15 @@
use Knp\Menu\ItemInterface;
use Sonata\AdminBundle\Event\ConfigureMenuEvent;
use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Contracts\Service\Attribute\Required;
use Symfony\Contracts\Translation\TranslatorInterface;

#[AutoconfigureTag('knp_menu.menu_builder', ['method' => 'getMenu', 'alias' => 'page_admin_menu'])]
#[AutoconfigureTag('knp_menu.menu_builder', ['method' => 'getRedirectionMenu', 'alias' => 'redirection_admin_menu'])]
final class PageMenuProvider implements ContainerAwareInterface
final class PageMenuProvider
{
use ContainerAwareTrait;

public const ORDER_NUMBER = 'priority';

#[Required]
Expand Down
58 changes: 29 additions & 29 deletions packages/admin/yarn-error.log
View file
Expand Up @@ -59,7 +59,7 @@ Lockfile:
"@jridgewell/gen-mapping" "^0.3.0"
"@jridgewell/trace-mapping" "^0.3.9"

"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13":
"@babel/code-frame@^6.4|^7.0.0", "@babel/code-frame@^7.22.13":
version "7.22.13"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
Expand Down Expand Up @@ -215,7 +215,7 @@ Lockfile:
dependencies:
"@babel/types" "^7.22.5"

"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
"@babel/helper-plugin-utils@^6.4|^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
Expand Down Expand Up @@ -933,7 +933,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-plugin-utils" "^6.4|^7.0.0"
"@babel/types" "^7.4.4"
esutils "^2.0.2"

Expand Down Expand Up @@ -1194,7 +1194,7 @@ Lockfile:
fslightbox "^3.2.2"
postcss "^8.4"
postcss-import "^15.0"
postcss-loader "^7.0"
postcss-loader "^6.4|^7.0"
sass "^1.56"
sass-loader "^13.3"
simple-jekyll-search "^1.9.1"
Expand Down Expand Up @@ -1380,7 +1380,7 @@ Lockfile:
dependencies:
"@types/istanbul-lib-report" "*"

"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
"@types/json-schema@*", "@types/json-schema@^6.4|^7.0.5", "@types/json-schema@^6.4|^7.0.8", "@types/json-schema@^6.4|^7.0.9":
version "7.0.13"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85"
integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
Expand Down Expand Up @@ -1651,16 +1651,16 @@ Lockfile:
resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
dependencies:
acorn "^7.0.0"
acorn-walk "^7.0.0"
acorn "^6.4|^7.0.0"
acorn-walk "^6.4|^7.0.0"
xtend "^4.0.2"

acorn-walk@^7.0.0:
acorn-walk@^6.4|^7.0.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==

acorn@^7.0.0:
acorn@^6.4|^7.0.0:
version "7.4.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
Expand Down Expand Up @@ -1827,7 +1827,7 @@ Lockfile:
normalize-range "^0.1.2"
num2fraction "^1.2.2"
picocolors "^0.2.1"
postcss "^7.0.32"
postcss "^6.4|^7.0.32"
postcss-value-parser "^4.1.0"

babel-code-frame@^6.26.0:
Expand Down Expand Up @@ -2179,7 +2179,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
dependencies:
fill-range "^7.0.1"
fill-range "^6.4|^7.0.1"

browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9:
version "4.21.11"
Expand Down Expand Up @@ -2522,7 +2522,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"
integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==

cross-spawn@^7.0.3:
cross-spawn@^6.4|^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
Expand Down Expand Up @@ -2975,7 +2975,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
dependencies:
cross-spawn "^7.0.3"
cross-spawn "^6.4|^7.0.3"
get-stream "^6.0.0"
human-signals "^2.1.0"
is-stream "^2.0.0"
Expand Down Expand Up @@ -3077,7 +3077,7 @@ Lockfile:
loader-utils "^2.0.0"
schema-utils "^3.0.0"

fill-range@^7.0.1:
fill-range@^6.4|^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
Expand Down Expand Up @@ -3243,7 +3243,7 @@ Lockfile:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.2.0:
glob@^6.4|^7.0.0, glob@^6.4|^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.2.0:
version "7.2.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
Expand Down Expand Up @@ -3271,7 +3271,7 @@ Lockfile:
integrity sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==
dependencies:
array-union "^1.0.1"
glob "^7.0.3"
glob "^6.4|^7.0.3"
object-assign "^4.0.1"
pify "^2.0.0"
pinkie-promise "^2.0.0"
Expand Down Expand Up @@ -3530,7 +3530,7 @@ Lockfile:
dependencies:
is-extglob "^2.1.1"

is-number@^7.0.0:
is-number@^6.4|^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
Expand Down Expand Up @@ -4113,7 +4113,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
dependencies:
"@babel/code-frame" "^7.0.0"
"@babel/code-frame" "^6.4|^7.0.0"
error-ex "^1.3.1"
json-parse-even-better-errors "^2.3.0"
lines-and-columns "^1.1.6"
Expand Down Expand Up @@ -4290,7 +4290,7 @@ Lockfile:
integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==
dependencies:
camelcase-css "^2.0.1"
postcss "^7.0.18"
postcss "^6.4|^7.0.18"

postcss-js@^4.0.1:
version "4.0.1"
Expand All @@ -4307,7 +4307,7 @@ Lockfile:
lilconfig "^2.0.5"
yaml "^2.1.1"

postcss-loader@^7.0:
postcss-loader@^6.4|^7.0:
version "7.3.3"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.3.tgz#6da03e71a918ef49df1bb4be4c80401df8e249dd"
integrity sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==
Expand Down Expand Up @@ -4399,7 +4399,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==
dependencies:
postcss "^7.0.32"
postcss "^6.4|^7.0.32"
postcss-selector-parser "^6.0.2"

postcss-nested@^6.0.1:
Expand Down Expand Up @@ -4553,7 +4553,7 @@ Lockfile:
source-map "^0.6.1"
supports-color "^5.4.0"

postcss@^7.0.11, postcss@^7.0.18, postcss@^7.0.32:
postcss@^6.4|^7.0.11, postcss@^6.4|^7.0.18, postcss@^6.4|^7.0.32:
version "7.0.39"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
Expand Down Expand Up @@ -4607,7 +4607,7 @@ Lockfile:
integrity sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==
dependencies:
commander "^5.0.0"
glob "^7.0.0"
glob "^6.4|^7.0.0"
postcss "7.0.32"
postcss-selector-parser "^6.0.2"

Expand Down Expand Up @@ -4874,7 +4874,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
dependencies:
"@types/json-schema" "^7.0.5"
"@types/json-schema" "^6.4|^7.0.5"
ajv "^6.12.4"
ajv-keywords "^3.5.2"

Expand All @@ -4883,7 +4883,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
dependencies:
"@types/json-schema" "^7.0.8"
"@types/json-schema" "^6.4|^7.0.8"
ajv "^6.12.5"
ajv-keywords "^3.5.2"

Expand All @@ -4892,7 +4892,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
dependencies:
"@types/json-schema" "^7.0.9"
"@types/json-schema" "^6.4|^7.0.9"
ajv "^8.9.0"
ajv-formats "^2.1.1"
ajv-keywords "^5.1.0"
Expand Down Expand Up @@ -5261,7 +5261,7 @@ Lockfile:
node-emoji "^1.8.1"
normalize.css "^8.0.1"
object-hash "^2.0.3"
postcss "^7.0.11"
postcss "^6.4|^7.0.11"
postcss-functions "^3.0.0"
postcss-js "^2.0.0"
postcss-nested "^4.1.1"
Expand Down Expand Up @@ -5366,7 +5366,7 @@ Lockfile:
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
dependencies:
is-number "^7.0.0"
is-number "^6.4|^7.0.0"

toidentifier@1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -5495,7 +5495,7 @@ Lockfile:
"@webpack-cli/serve" "^2.0.5"
colorette "^2.0.14"
commander "^10.0.1"
cross-spawn "^7.0.3"
cross-spawn "^6.4|^7.0.3"
envinfo "^7.7.3"
fastest-levenshtein "^1.0.12"
import-local "^3.0.2"
Expand Down

0 comments on commit b44eea0

Please sign in to comment.