From 487f1490b04fbf9a0fe86f3cf933f97b848de6df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lys=C3=BD?= Date: Wed, 5 Jun 2024 14:12:54 +0200 Subject: [PATCH] Update composer package doctrine/orm The used version is limited by the package dependencies which can cause incompatibility on WP.org SVN. [MAILPOET-6101] --- mailpoet/prefixer/composer.json | 2 +- mailpoet/prefixer/composer.lock | 34 ++++++++++--------- mailpoet/prefixer/fix-doctrine.php | 1 - .../tasks/phpstan/phpstan-7-baseline.neon | 9 ++--- .../tasks/phpstan/phpstan-8-baseline.neon | 9 ++--- 5 files changed, 23 insertions(+), 32 deletions(-) diff --git a/mailpoet/prefixer/composer.json b/mailpoet/prefixer/composer.json index fe74109498..7efb209b27 100644 --- a/mailpoet/prefixer/composer.json +++ b/mailpoet/prefixer/composer.json @@ -10,7 +10,7 @@ "cerdic/css-tidy": "2.1.0", "doctrine/common": "3.4.4", "doctrine/dbal": "2.13.8", - "doctrine/orm": "2.11.2", + "doctrine/orm": "2.13.5", "gregwar/captcha": "1.2.1", "monolog/monolog": "2.9.3", "nesbot/carbon": "2.72.5", diff --git a/mailpoet/prefixer/composer.lock b/mailpoet/prefixer/composer.lock index ce887ec317..f08858b550 100644 --- a/mailpoet/prefixer/composer.lock +++ b/mailpoet/prefixer/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": "537f685c18362d00a77a60e6df02903a", + "content-hash": "8ca3521a9843d1729a1c075f23b8714f", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -868,16 +868,16 @@ }, { "name": "doctrine/orm", - "version": "2.11.2", + "version": "2.13.5", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "9c351e044478135aec1755e2c0c0493a4b6309db" + "reference": "099e51d8990c586778c564a9ed1eaa6401f2bc83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/9c351e044478135aec1755e2c0c0493a4b6309db", - "reference": "9c351e044478135aec1755e2c0c0493a4b6309db", + "url": "https://api.github.com/repos/doctrine/orm/zipball/099e51d8990c586778c564a9ed1eaa6401f2bc83", + "reference": "099e51d8990c586778c564a9ed1eaa6401f2bc83", "shasum": "" }, "require": { @@ -886,34 +886,36 @@ "doctrine/collections": "^1.5", "doctrine/common": "^3.0.3", "doctrine/dbal": "^2.13.1 || ^3.2", - "doctrine/deprecations": "^0.5.3", + "doctrine/deprecations": "^0.5.3 || ^1", "doctrine/event-manager": "^1.1", "doctrine/inflector": "^1.4 || ^2.0", "doctrine/instantiator": "^1.3", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^2.2", + "doctrine/lexer": "^1.2.3", + "doctrine/persistence": "^2.4 || ^3", "ext-ctype": "*", "php": "^7.1 || ^8.0", "psr/cache": "^1 || ^2 || ^3", "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0", "symfony/polyfill-php72": "^1.23", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "doctrine/annotations": "<1.13 || >= 2.0" }, "require-dev": { "doctrine/annotations": "^1.13", - "doctrine/coding-standard": "^9.0", + "doctrine/coding-standard": "^9.0.2 || ^11.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "1.4.6", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", - "squizlabs/php_codesniffer": "3.6.2", + "phpstan/phpstan": "~1.4.10 || 1.9.4", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psr/log": "^1 || ^2 || ^3", + "squizlabs/php_codesniffer": "3.7.1", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.22.0" + "vimeo/psalm": "4.30.0 || 5.3.0" }, "suggest": { + "ext-dom": "Provides support for XSD validation for XML mapping files", "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, @@ -960,9 +962,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.11.2" + "source": "https://github.com/doctrine/orm/tree/2.13.5" }, - "time": "2022-03-09T15:23:58+00:00" + "time": "2022-12-19T14:04:28+00:00" }, { "name": "doctrine/persistence", diff --git a/mailpoet/prefixer/fix-doctrine.php b/mailpoet/prefixer/fix-doctrine.php index 1b39cf7fd4..e526c53930 100755 --- a/mailpoet/prefixer/fix-doctrine.php +++ b/mailpoet/prefixer/fix-doctrine.php @@ -126,7 +126,6 @@ exec('rm ' . __DIR__ . '/../vendor-prefixed/doctrine/dbal/lib/Doctrine/DBAL/Plat // cleanup Doctrine ORM exec('rm -r ' . __DIR__ . '/../vendor-prefixed/doctrine/orm/bin'); -exec('rm -r ' . __DIR__ . '/../vendor-prefixed/doctrine/orm/ci'); exec('rm -r ' . __DIR__ . '/../vendor-prefixed/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php'); exec('rm -r ' . __DIR__ . '/../vendor-prefixed/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/SimplifiedXmlDriver.php'); exec('rm -r ' . __DIR__ . '/../vendor-prefixed/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/SimplifiedYamlDriver.php'); diff --git a/mailpoet/tasks/phpstan/phpstan-7-baseline.neon b/mailpoet/tasks/phpstan/phpstan-7-baseline.neon index 4f1f008eda..89e940d7e2 100644 --- a/mailpoet/tasks/phpstan/phpstan-7-baseline.neon +++ b/mailpoet/tasks/phpstan/phpstan-7-baseline.neon @@ -221,8 +221,8 @@ parameters: path: ../../lib/Doctrine/PSRArrayCache.php - - message: "#^Cannot access offset 'name' on mixed\\.$#" - count: 2 + message: "#^Offset 'joinTable' does not exist on array\\{cache\\?\\: array, cascade\\: array\\, declared\\?\\: class-string, fetch\\: mixed, fieldName\\: string, id\\?\\: bool, inherited\\?\\: class-string, indexBy\\?\\: string, \\.\\.\\.}\\.$#" + count: 1 path: ../../lib/Doctrine/TablePrefixMetadataFactory.php - @@ -550,11 +550,6 @@ parameters: count: 1 path: ../../lib/Segments/SegmentSubscribersRepository.php - - - message: "#^Parameter \\#2 \\$y of method MailPoetVendor\\\\Doctrine\\\\DBAL\\\\Query\\\\Expression\\\\ExpressionBuilder\\:\\:notIn\\(\\) expects array\\\\|string, mixed given\\.$#" - count: 1 - path: ../../lib/Segments/SegmentSubscribersRepository.php - - message: "#^Cannot access offset 'id' on mixed\\.$#" count: 3 diff --git a/mailpoet/tasks/phpstan/phpstan-8-baseline.neon b/mailpoet/tasks/phpstan/phpstan-8-baseline.neon index 15e1d1fb45..9b332089c5 100644 --- a/mailpoet/tasks/phpstan/phpstan-8-baseline.neon +++ b/mailpoet/tasks/phpstan/phpstan-8-baseline.neon @@ -221,8 +221,8 @@ parameters: path: ../../lib/Doctrine/PSRArrayCache.php - - message: "#^Cannot access offset 'name' on mixed\\.$#" - count: 2 + message: "#^Offset 'joinTable' does not exist on array\\{cache\\?\\: array, cascade\\: array\\, declared\\?\\: class-string, fetch\\: mixed, fieldName\\: string, id\\?\\: bool, inherited\\?\\: class-string, indexBy\\?\\: string, \\.\\.\\.}\\.$#" + count: 1 path: ../../lib/Doctrine/TablePrefixMetadataFactory.php - @@ -540,11 +540,6 @@ parameters: count: 1 path: ../../lib/Segments/SegmentSubscribersRepository.php - - - message: "#^Parameter \\#2 \\$y of method MailPoetVendor\\\\Doctrine\\\\DBAL\\\\Query\\\\Expression\\\\ExpressionBuilder\\:\\:notIn\\(\\) expects array\\\\|string, mixed given\\.$#" - count: 1 - path: ../../lib/Segments/SegmentSubscribersRepository.php - - message: "#^Cannot access offset 'id' on mixed\\.$#" count: 3