diff --git a/README.md b/README.md index 55ec5f0..527617c 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,7 @@ If you choose this path, you can install this package in the following steps: ``` Then depending on the version of doctrine/orm you want to use: +- run `composer require sspat/doctrine-nullable-embeddables:v2.16.0 doctrine/orm:2.16.0` - run `composer require sspat/doctrine-nullable-embeddables:v2.15.5 doctrine/orm:2.15.5` - run `composer require sspat/doctrine-nullable-embeddables:v2.15.4 doctrine/orm:2.15.4` - run `composer require sspat/doctrine-nullable-embeddables:v2.15.3 doctrine/orm:2.15.3` diff --git a/composer.json b/composer.json index 4edbc25..0ab9c1f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": "^7.4|^8.0", "cweagans/composer-patches": "^1.6|^1.7", - "doctrine/orm": "2.15.5" + "doctrine/orm": "2.16.0" }, "require-dev": { "phpunit/phpunit": "^9.5" @@ -31,7 +31,7 @@ "extra": { "patches": { "doctrine/orm": { - "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.15.5/patch/nullable_embeddables.patch" + "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.16.0/patch/nullable_embeddables.patch" } } }, diff --git a/patch/nullable_embeddables.patch b/patch/nullable_embeddables.patch index 65e0c67..126f03e 100644 --- a/patch/nullable_embeddables.patch +++ b/patch/nullable_embeddables.patch @@ -1,5 +1,5 @@ diff --git a/a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php b/b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php -index 563a699..3e2020d 100644 +index db4c1f8..c830e7d 100644 --- a/a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php +++ b/b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php @@ -49,13 +49,16 @@ class ReflectionEmbeddedProperty extends ReflectionProperty