Use an experimental doctrine/orm version to fix some issues persisting attachments while simutanously creating a new attachment type

The circular reference between attachmentTypeAttachment and attachmentType seems to confuse doctrine. This is fixed in the experimental version
This commit is contained in:
Jan Böhmer 2023-07-15 21:17:10 +02:00
parent 422fa01c6f
commit 701212239d
2 changed files with 57 additions and 46 deletions

View file

@ -18,7 +18,7 @@
"doctrine/dbal": "^3.4.6",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.9",
"doctrine/orm": "dev-entity-level-commit-order#44d2a83 as 2.15.3",
"dompdf/dompdf": "dev-master#87bea32efe0b0db309e1d31537201f64d5508280 as v2.0.3",
"erusev/parsedown": "^1.7",
"florianv/swap": "^4.0",

101
composer.lock generated
View file

@ -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": "e851e50a8353b7633581464ad286c6f7",
"content-hash": "2996892a0aeaa1363a3d9643551d2e58",
"packages": [
{
"name": "beberlei/assert",
@ -1556,16 +1556,16 @@
},
{
"name": "doctrine/orm",
"version": "2.15.3",
"version": "dev-entity-level-commit-order",
"source": {
"type": "git",
"url": "https://github.com/doctrine/orm.git",
"reference": "4c3bd208018c26498e5f682aaad45fa00ea307d5"
"reference": "44d2a83"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/orm/zipball/4c3bd208018c26498e5f682aaad45fa00ea307d5",
"reference": "4c3bd208018c26498e5f682aaad45fa00ea307d5",
"url": "https://api.github.com/repos/doctrine/orm/zipball/44d2a83",
"reference": "44d2a83",
"shasum": ""
},
"require": {
@ -1651,9 +1651,9 @@
],
"support": {
"issues": "https://github.com/doctrine/orm/issues",
"source": "https://github.com/doctrine/orm/tree/2.15.3"
"source": "https://github.com/doctrine/orm/tree/entity-level-commit-order"
},
"time": "2023-06-22T12:36:06+00:00"
"time": "2023-06-28T09:45:39+00:00"
},
{
"name": "doctrine/persistence",
@ -3094,16 +3094,16 @@
},
{
"name": "league/html-to-markdown",
"version": "5.1.0",
"version": "5.1.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/html-to-markdown.git",
"reference": "e0fc8cf07bdabbcd3765341ecb50c34c271d64e1"
"reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e0fc8cf07bdabbcd3765341ecb50c34c271d64e1",
"reference": "e0fc8cf07bdabbcd3765341ecb50c34c271d64e1",
"url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0b4066eede55c48f38bcee4fb8f0aa85654390fd",
"reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd",
"shasum": ""
},
"require": {
@ -3113,11 +3113,11 @@
},
"require-dev": {
"mikehaertl/php-shellcommand": "^1.1.0",
"phpstan/phpstan": "^0.12.99",
"phpstan/phpstan": "^1.8.8",
"phpunit/phpunit": "^8.5 || ^9.2",
"scrutinizer/ocular": "^1.6",
"unleashedtech/php-coding-standard": "^2.7",
"vimeo/psalm": "^4.22"
"unleashedtech/php-coding-standard": "^2.7 || ^3.0",
"vimeo/psalm": "^4.22 || ^5.0"
},
"bin": [
"bin/html-to-markdown"
@ -3159,7 +3159,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/html-to-markdown/issues",
"source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.0"
"source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.1"
},
"funding": [
{
@ -3179,7 +3179,7 @@
"type": "tidelift"
}
],
"time": "2022-03-02T17:24:08+00:00"
"time": "2023-07-12T21:21:09+00:00"
},
{
"name": "liip/imagine-bundle",
@ -13110,7 +13110,7 @@
},
{
"name": "web-auth/metadata-service",
"version": "4.6.3",
"version": "4.6.4",
"source": {
"type": "git",
"url": "https://github.com/web-auth/webauthn-metadata-service.git",
@ -13175,7 +13175,7 @@
"webauthn"
],
"support": {
"source": "https://github.com/web-auth/webauthn-metadata-service/tree/4.6.3"
"source": "https://github.com/web-auth/webauthn-metadata-service/tree/4.6.4"
},
"funding": [
{
@ -13191,16 +13191,16 @@
},
{
"name": "web-auth/webauthn-lib",
"version": "4.6.3",
"version": "4.6.4",
"source": {
"type": "git",
"url": "https://github.com/web-auth/webauthn-lib.git",
"reference": "e0f85f09b4e1a48169352290e7ccfd29ade93e34"
"reference": "8cb4949d81ef8414c82f334fb3514141aa013340"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/e0f85f09b4e1a48169352290e7ccfd29ade93e34",
"reference": "e0f85f09b4e1a48169352290e7ccfd29ade93e34",
"url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/8cb4949d81ef8414c82f334fb3514141aa013340",
"reference": "8cb4949d81ef8414c82f334fb3514141aa013340",
"shasum": ""
},
"require": {
@ -13263,7 +13263,7 @@
"webauthn"
],
"support": {
"source": "https://github.com/web-auth/webauthn-lib/tree/4.6.3"
"source": "https://github.com/web-auth/webauthn-lib/tree/4.6.4"
},
"funding": [
{
@ -13275,11 +13275,11 @@
"type": "patreon"
}
],
"time": "2023-06-12T14:32:32+00:00"
"time": "2023-07-15T14:53:06+00:00"
},
{
"name": "web-auth/webauthn-symfony-bundle",
"version": "4.6.3",
"version": "4.6.4",
"source": {
"type": "git",
"url": "https://github.com/web-auth/webauthn-symfony-bundle.git",
@ -13343,7 +13343,7 @@
"webauthn"
],
"support": {
"source": "https://github.com/web-auth/webauthn-symfony-bundle/tree/4.6.3"
"source": "https://github.com/web-auth/webauthn-symfony-bundle/tree/4.6.4"
},
"funding": [
{
@ -14782,16 +14782,16 @@
},
{
"name": "rector/rector",
"version": "0.17.4",
"version": "0.17.6",
"source": {
"type": "git",
"url": "https://github.com/rectorphp/rector.git",
"reference": "14829888274eebddc67a0d7248c3dd2965704fbc"
"reference": "ec40080b9bdaf39eb0c0a9276cd7b4a778c03f21"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/14829888274eebddc67a0d7248c3dd2965704fbc",
"reference": "14829888274eebddc67a0d7248c3dd2965704fbc",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/ec40080b9bdaf39eb0c0a9276cd7b4a778c03f21",
"reference": "ec40080b9bdaf39eb0c0a9276cd7b4a778c03f21",
"shasum": ""
},
"require": {
@ -14831,7 +14831,7 @@
],
"support": {
"issues": "https://github.com/rectorphp/rector/issues",
"source": "https://github.com/rectorphp/rector/tree/0.17.4"
"source": "https://github.com/rectorphp/rector/tree/0.17.6"
},
"funding": [
{
@ -14839,7 +14839,7 @@
"type": "github"
}
],
"time": "2023-07-11T16:00:46+00:00"
"time": "2023-07-14T09:54:15+00:00"
},
{
"name": "roave/security-advisories",
@ -14847,12 +14847,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "bcc78ca7e0e2bf8f2f8afd4eb9aabb988d593c21"
"reference": "63f15424de3fd93ab776497787df3bb2eded004b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bcc78ca7e0e2bf8f2f8afd4eb9aabb988d593c21",
"reference": "bcc78ca7e0e2bf8f2f8afd4eb9aabb988d593c21",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/63f15424de3fd93ab776497787df3bb2eded004b",
"reference": "63f15424de3fd93ab776497787df3bb2eded004b",
"shasum": ""
},
"conflict": {
@ -14912,6 +14912,7 @@
"cakephp/cakephp": "<3.10.3|>=4,<4.0.10|>=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10|= 1.3.7|>=4.1,<4.1.4",
"cakephp/database": ">=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10",
"cardgate/magento2": "<2.0.33",
"cardgate/woocommerce": "<=3.1.15",
"cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
"cartalyst/sentry": "<=2.1.6",
"catfan/medoo": "<1.7.5",
@ -15033,6 +15034,7 @@
"grumpydictator/firefly-iii": "<6",
"guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
"guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5",
"haffner/jh_captcha": "<=2.1.3|>=3,<=3.0.2",
"harvesthq/chosen": "<1.8.7",
"helloxz/imgurl": "= 2.31|<=2.31",
"hhxsv5/laravel-s": "<3.7.36",
@ -15054,7 +15056,7 @@
"illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40",
"illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
"illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
"impresscms/impresscms": "<=1.4.3",
"impresscms/impresscms": "<=1.4.5",
"in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.1",
"in2code/ipandlanguageredirect": "<5.1.2",
"in2code/lux": "<17.6.1|>=18,<24.0.2",
@ -15105,7 +15107,7 @@
"lms/routes": "<2.1.1",
"localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
"luyadev/yii-helpers": "<1.2.1",
"magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3",
"magento/community-edition": "<=2.4",
"magento/magento1ce": "<1.9.4.3",
"magento/magento1ee": ">=1,<1.14.4.3",
"magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2",
@ -15121,14 +15123,14 @@
"melisplatform/melis-front": "<5.0.1",
"mezzio/mezzio-swoole": "<3.7|>=4,<4.3",
"mgallegos/laravel-jqgrid": "<=1.3",
"microweber/microweber": "<=1.3.4",
"microweber/microweber": "= 1.1.18|<=1.3.4",
"miniorange/miniorange-saml": "<1.4.3",
"mittwald/typo3_forum": "<1.2.1",
"mobiledetect/mobiledetectlib": "<2.8.32",
"modx/revolution": "<= 2.8.3-pl|<2.8",
"mojo42/jirafeau": "<4.4",
"monolog/monolog": ">=1.8,<1.12",
"moodle/moodle": "<4.2-rc.2|= 4.2.0|= 3.11",
"moodle/moodle": "<4.2-rc.2|= 3.7|= 3.9|= 3.8|= 4.2.0|= 3.11",
"movim/moxl": ">=0.8,<=0.10",
"mustache/mustache": ">=2,<2.14.1",
"namshi/jose": "<2.2",
@ -15160,7 +15162,7 @@
"openid/php-openid": "<2.3",
"openmage/magento-lts": "<19.4.22|>=20,<20.0.19",
"opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2",
"orchid/platform": ">=9,<9.4.4",
"orchid/platform": ">=9,<9.4.4|>=14-alpha.4,<14.5",
"oro/commerce": ">=4.1,<5.0.6",
"oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
"oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8",
@ -15178,7 +15180,7 @@
"personnummer/personnummer": "<3.0.2",
"phanan/koel": "<5.1.4",
"php-mod/curl": "<2.3.2",
"phpbb/phpbb": ">=3.2,<3.2.10|>=3.3,<3.3.1",
"phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1",
"phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7",
"phpmailer/phpmailer": "<6.5",
"phpmussel/phpmussel": ">=1,<1.6",
@ -15194,13 +15196,14 @@
"phpxmlrpc/extras": "<0.6.1",
"phpxmlrpc/phpxmlrpc": "<4.9.2",
"pi/pi": "<=2.5",
"pimcore/admin-ui-classic-bundle": "<1.0.3",
"pimcore/customer-management-framework-bundle": "<3.4.1",
"pimcore/data-hub": "<1.2.4",
"pimcore/perspective-editor": "<1.5.1",
"pimcore/pimcore": "<10.5.23",
"pimcore/pimcore": "<10.5.24",
"pixelfed/pixelfed": "<=0.11.4",
"pocketmine/bedrock-protocol": "<8.0.2",
"pocketmine/pocketmine-mp": "<4.20.5|>=4.21,<4.21.1|< 4.18.0-ALPHA2|>= 4.0.0-BETA5, < 4.4.2",
"pocketmine/pocketmine-mp": "<4.22.3|>=5,<5.2.1|< 4.18.0-ALPHA2|>= 4.0.0-BETA5, < 4.4.2",
"pressbooks/pressbooks": "<5.18",
"prestashop/autoupgrade": ">=4,<4.10.1",
"prestashop/blockwishlist": ">=2,<2.1.1",
@ -15351,7 +15354,7 @@
"truckersmp/phpwhois": "<=4.3.1",
"ttskch/pagination-service-provider": "<1",
"twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3",
"typo3/cms": "<2.0.5|>=3,<3.0.3|>=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2",
"typo3/cms": "<2.0.5|>=3,<3.0.3|>=6.2,<=6.2.38|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2",
"typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
"typo3/cms-core": "<8.7.51|>=9,<9.5.40|>=10,<10.4.36|>=11,<11.5.23|>=12,<12.2",
"typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
@ -15429,6 +15432,7 @@
"zendframework/zendframework1": "<1.12.20",
"zendframework/zendopenid": ">=2,<2.0.2",
"zendframework/zendxml": ">=1,<1.0.1",
"zenstruck/collection": "<0.2.1",
"zetacomponents/mail": "<1.8.2",
"zf-commons/zfc-user": "<1.2.2",
"zfcampus/zf-apigility-doctrine": ">=1,<1.0.3",
@ -15471,7 +15475,7 @@
"type": "tidelift"
}
],
"time": "2023-07-11T01:32:50+00:00"
"time": "2023-07-14T22:04:26+00:00"
},
{
"name": "sebastian/diff",
@ -16234,6 +16238,12 @@
}
],
"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",
@ -16243,6 +16253,7 @@
],
"minimum-stability": "stable",
"stability-flags": {
"doctrine/orm": 20,
"dompdf/dompdf": 20,
"florianv/swap-bundle": 20,
"roave/security-advisories": 20