diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ea522ca..d5b83c81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`1.6.0...main`][1.6.0...main]. +### Changed + +- Allowed installation of `doctrine/orm:^3.0.0` ([#1292]), by [@localheinz] + ## [`1.6.0`][1.6.0] For a full diff see [`1.5.0...1.6.0`][1.5.0...1.6.0]. @@ -355,6 +359,7 @@ For a full diff see [`fa9c564...0.1.0`][fa9c564...0.1.0]. [#1213]: https://github.com/ergebnis/factory-bot/pull/1213 [#1233]: https://github.com/ergebnis/factory-bot/pull/1233 [#1234]: https://github.com/ergebnis/factory-bot/pull/1234 +[#1292]: https://github.com/ergebnis/factory-bot/pull/1292 [@abenerd]: https://github.com/abenerd [@localheinz]: https://github.com/localheinz diff --git a/composer.json b/composer.json index a2b0791a..cfa3614a 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "doctrine/collections": "^1.6.5 || ^2.0.0", "doctrine/dbal": "^2.12.0 || ^3.0.0", - "doctrine/orm": "^2.9.0", + "doctrine/orm": "^2.9.0 || ^3.0.0", "doctrine/persistence": "^2.1.0 || ^3.0.0", "ergebnis/classy": "^1.6.0", "fakerphp/faker": "^1.20.0" diff --git a/composer.lock b/composer.lock index 28251421..b5df45f0 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": "df43cf6c6ad40820884893c5ded8a37f", + "content-hash": "f686169d6d88398a7f3515b21b7f2ca1", "packages": [ { "name": "doctrine/cache", @@ -768,16 +768,16 @@ }, { "name": "doctrine/orm", - "version": "2.17.1", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "1a4fe6e0bb67762370937a7e6cee3da40a9122d1" + "reference": "f2176a9ce56cafdfd1624d54bfdb076819083d5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/1a4fe6e0bb67762370937a7e6cee3da40a9122d1", - "reference": "1a4fe6e0bb67762370937a7e6cee3da40a9122d1", + "url": "https://api.github.com/repos/doctrine/orm/zipball/f2176a9ce56cafdfd1624d54bfdb076819083d5b", + "reference": "f2176a9ce56cafdfd1624d54bfdb076819083d5b", "shasum": "" }, "require": { @@ -790,7 +790,7 @@ "doctrine/event-manager": "^1.2 || ^2", "doctrine/inflector": "^1.4 || ^2.0", "doctrine/instantiator": "^1.3 || ^2", - "doctrine/lexer": "^2", + "doctrine/lexer": "^2 || ^3", "doctrine/persistence": "^2.4 || ^3", "ext-ctype": "*", "php": "^7.1 || ^8.0", @@ -810,10 +810,10 @@ "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.15.0" + "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7.0", + "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2 || ^7.0", + "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "vimeo/psalm": "4.30.0 || 5.16.0" }, "suggest": { "ext-dom": "Provides support for XSD validation for XML mapping files", @@ -826,7 +826,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\ORM\\": "lib/Doctrine/ORM" + "Doctrine\\ORM\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -863,9 +863,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.17.1" + "source": "https://github.com/doctrine/orm/tree/2.18.0" }, - "time": "2023-11-17T06:25:40+00:00" + "time": "2024-01-31T15:53:12+00:00" }, { "name": "doctrine/persistence",