From 1a3e5ec705a68ba00bbae8aa7ae6e08f2adbf138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Tue, 1 Aug 2023 15:34:37 +0200 Subject: [PATCH] Updated dependencies The commit order changes were merged into doctrines main branch, so we can now use the official release instead of the development branch again. --- composer.json | 2 +- composer.lock | 37 +++++++++++++++---------------------- yarn.lock | 26 +++++++++++++------------- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index fd96da4b..a7844452 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "doctrine/dbal": "^3.4.6", "doctrine/doctrine-bundle": "^2.0", "doctrine/doctrine-migrations-bundle": "^3.0", - "doctrine/orm": "dev-entity-level-commit-order#44d2a83 as 2.15.3", + "doctrine/orm": "^2.16", "dompdf/dompdf": "dev-master#87bea32efe0b0db309e1d31537201f64d5508280 as v2.0.3", "erusev/parsedown": "^1.7", "florianv/swap": "^4.0", diff --git a/composer.lock b/composer.lock index 08fca3d9..971f75cd 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": "1c3a6a5bba2865b104630aaf4336e483", + "content-hash": "b1ad5ff23ca8d2cc779fed986a8e2c9a", "packages": [ { "name": "beberlei/assert", @@ -1556,16 +1556,16 @@ }, { "name": "doctrine/orm", - "version": "dev-entity-level-commit-order", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "44d2a83" + "reference": "495cd06b9a630f9c38a21ceb249ed008edbe8414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/44d2a83", - "reference": "44d2a83", + "url": "https://api.github.com/repos/doctrine/orm/zipball/495cd06b9a630f9c38a21ceb249ed008edbe8414", + "reference": "495cd06b9a630f9c38a21ceb249ed008edbe8414", "shasum": "" }, "require": { @@ -1594,14 +1594,14 @@ "doctrine/annotations": "^1.13 || ^2", "doctrine/coding-standard": "^9.0.2 || ^12.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.10.18", + "phpstan/phpstan": "~1.4.10 || 1.10.25", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.30.0 || 5.12.0" + "vimeo/psalm": "4.30.0 || 5.13.1" }, "suggest": { "ext-dom": "Provides support for XSD validation for XML mapping files", @@ -1651,9 +1651,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/entity-level-commit-order" + "source": "https://github.com/doctrine/orm/tree/2.16.0" }, - "time": "2023-06-28T09:45:39+00:00" + "time": "2023-08-01T12:07:04+00:00" }, { "name": "doctrine/persistence", @@ -16704,16 +16704,16 @@ }, { "name": "vimeo/psalm", - "version": "5.14.0", + "version": "5.14.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "b2942cefed8443002bd3f245c4cd0a54193716d8" + "reference": "b9d355e0829c397b9b3b47d0c0ed042a8a70284d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/b2942cefed8443002bd3f245c4cd0a54193716d8", - "reference": "b2942cefed8443002bd3f245c4cd0a54193716d8", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/b9d355e0829c397b9b3b47d0c0ed042a8a70284d", + "reference": "b9d355e0829c397b9b3b47d0c0ed042a8a70284d", "shasum": "" }, "require": { @@ -16804,18 +16804,12 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.14.0" + "source": "https://github.com/vimeo/psalm/tree/5.14.1" }, - "time": "2023-07-30T20:18:56+00:00" + "time": "2023-08-01T05:16:55+00:00" } ], "aliases": [ - { - "package": "doctrine/orm", - "version": "dev-entity-level-commit-order", - "alias": "2.15.3", - "alias_normalized": "2.15.3.0" - }, { "package": "dompdf/dompdf", "version": "9999999-dev", @@ -16825,7 +16819,6 @@ ], "minimum-stability": "stable", "stability-flags": { - "doctrine/orm": 20, "dompdf/dompdf": 20, "florianv/swap-bundle": 20, "roave/security-advisories": 20 diff --git a/yarn.lock b/yarn.lock index 061509e9..d10b012d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -999,10 +999,10 @@ "@ckeditor/ckeditor5-utils" "38.1.1" lodash-es "^4.17.15" -"@ckeditor/ckeditor5-dev-translations@^38.1.3": - version "38.1.3" - resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-dev-translations/-/ckeditor5-dev-translations-38.1.3.tgz#8d5da3337b9388a00a7f07de756d4e75a3c34148" - integrity sha512-bV3p+qDV/skadIjEgFQBoOcjM7zZLdEdEq6gmElwtkIFn68aSIeGoZEkfbqhv5TDcVI3w5cDinO8dXsiVOYA/Q== +"@ckeditor/ckeditor5-dev-translations@^38.1.4": + version "38.1.4" + resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-dev-translations/-/ckeditor5-dev-translations-38.1.4.tgz#5171227fb0f8ed7bddbe1aa98b1c31be6b233261" + integrity sha512-mHiIX4BAl6/h8IFher0BEGOf5ULDc/sf6D1/bQOWUG8i8qP0MqxDSBadow8lbYvfQdX5JlAR3e7m8WZz612Gqg== dependencies: "@babel/parser" "^7.18.9" "@babel/traverse" "^7.18.9" @@ -1042,18 +1042,18 @@ ts-loader "^9.3.0" "@ckeditor/ckeditor5-dev-utils@^38.0.1": - version "38.1.3" - resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-dev-utils/-/ckeditor5-dev-utils-38.1.3.tgz#d1c37100a0263d68aa4456368de24d228beb6e37" - integrity sha512-6KRPykWRvLom6n2Bn3+6R5ocIGVtF0N6WOcPr6k6t3bW+C/lIXxoN6MhFN58+HE8+3cz0HFe/NXWFshtlYBRbw== + version "38.1.4" + resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-dev-utils/-/ckeditor5-dev-utils-38.1.4.tgz#0c2481e01b7ea683552576d5bbc96d7fa6cb2fed" + integrity sha512-S2VAeT1W0y3UknQWpDUpqPrDMNVZ/hvxMVIYfF5EISt3hL1gyK9H9eUA1dYmHSsxVrNCsHRpjyEBxOMWoiYtZg== dependencies: - "@ckeditor/ckeditor5-dev-translations" "^38.1.3" + "@ckeditor/ckeditor5-dev-translations" "^38.1.4" chalk "^3.0.0" cli-cursor "^3.1.0" cli-spinners "^2.6.1" css-loader "^5.2.7" cssnano "^5.0.0" del "^5.0.0" - esbuild-loader "^3.0.1" + esbuild-loader "~3.0.1" fs-extra "^9.1.0" is-interactive "^1.0.0" javascript-stringify "^1.6.0" @@ -3541,9 +3541,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.477: - version "1.4.478" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.478.tgz#687198cfcef9b854a79a229feaa6cd8961206290" - integrity sha512-qjTA8djMXd+ruoODDFGnRCRBpID+AAfYWCyGtYTNhsuwxI19s8q19gbjKTwRS5z/LyVf5wICaIiPQGLekmbJbA== + version "1.4.479" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz#ec9f676f23d3a0b0e429bc454d25e0b3253d2118" + integrity sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ== emoji-regex@^8.0.0: version "8.0.0" @@ -3657,7 +3657,7 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.1: d "^1.0.1" ext "^1.1.2" -esbuild-loader@^3.0.1: +esbuild-loader@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-3.0.1.tgz#9871c0e8817c4c11b6249d1916832e75272e6c7e" integrity sha512-aZfGybqTeuyCd4AsVvWOOfkhIuN+wfZFjMyh3gyQEU1Uvsl8L6vye9HqP93iRa0iTA+6Jclap514PJIC3cLnMA==