Support for 2.18.0

sspat · Nov 6, 2024 · d316786 · d316786
1 parent 2f3ef03
commit d316786
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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)