From d316786d14191a8d06cf44cc382fca6a8fde1d87 Mon Sep 17 00:00:00 2001 From: Patrik Foldes Date: Wed, 6 Nov 2024 20:10:21 +0300 Subject: [PATCH] Support for 2.18.0 --- README.md | 1 + composer.json | 4 ++-- patch/nullable_embeddables.patch | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ad4731f..7a6d7fd 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.18.0 doctrine/orm:2.18.0` - run `composer require sspat/doctrine-nullable-embeddables:v2.17.5 doctrine/orm:2.17.5` - run `composer require sspat/doctrine-nullable-embeddables:v2.17.4 doctrine/orm:2.17.4` - run `composer require sspat/doctrine-nullable-embeddables:v2.17.3 doctrine/orm:2.17.3` diff --git a/composer.json b/composer.json index bbca04a..c3fd750 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.17.5" + "doctrine/orm": "2.18.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.17.5/patch/nullable_embeddables.patch" + "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.18.0/patch/nullable_embeddables.patch" } } }, diff --git a/patch/nullable_embeddables.patch b/patch/nullable_embeddables.patch index 126f03e..e08eaf6 100644 --- a/patch/nullable_embeddables.patch +++ b/patch/nullable_embeddables.patch @@ -1,7 +1,7 @@ -diff --git a/a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php b/b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php +diff --git a/a/src/Mapping/ReflectionEmbeddedProperty.php b/b/src/Mapping/ReflectionEmbeddedProperty.php index db4c1f8..c830e7d 100644 ---- a/a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php -+++ b/b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php +--- a/a/src/Mapping/ReflectionEmbeddedProperty.php ++++ b/b/src/Mapping/ReflectionEmbeddedProperty.php @@ -49,13 +49,16 @@ class ReflectionEmbeddedProperty extends ReflectionProperty #[ReturnTypeWillChange] public function getValue($object = null)