added support for 2.8.3 (#15)

* added support for 2.8.3
* Remove dependency on doctrine test files

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.8.3 doctrine/orm`
 - run `composer require sspat/doctrine-nullable-embeddables:v2.8.2 doctrine/orm` 
 - run `composer require sspat/doctrine-nullable-embeddables:v2.8.1 doctrine/orm`
 - run `composer require sspat/doctrine-nullable-embeddables:v2.8.0 doctrine/orm`

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "cweagans/composer-patches": "^1.6|^1.7",
-        "doctrine/orm": "2.8.2"
+        "doctrine/orm": "2.8.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
@@ -31,16 +31,19 @@
     "extra": {
         "patches": {
             "doctrine/orm": {
-                "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.8.2/patch/nullable_embeddables.patch"
+                "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.8.3/patch/nullable_embeddables.patch"
             }
         }
     },
     "config": {
         "preferred-install": {
-            "*": "dist",
-            "doctrine/orm": "source"
+            "*": "dist"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "cweagans/composer-patches": true
+        }
     },
     "scripts": {
         "test": "phpunit"

tests/Models/Generic/BooleanModel.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineNullableEmbeddables\Tests\Models\Generic;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\GeneratedValue;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\Table;
+
+/**
+ * @Entity
+ * @Table(name="boolean_model")
+ */
+class BooleanModel
+{
+    /**
+     * @var int
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    public $id;
+
+    /**
+     * @var bool
+     * @Column(type="boolean")
+     */
+    public $booleanField;
+}

tests/Models/Reflection/AbstractEmbeddable.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineNullableEmbeddables\Tests\Models\Reflection;
+
+/**
+ * A test asset used to check that embeddables support properties defined in abstract classes
+ */
+abstract class AbstractEmbeddable
+{
+    /** @var string */
+    private $propertyInAbstractClass;
+}

tests/Models/Reflection/ArrayObjectExtendingClass.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineNullableEmbeddables\Tests\Models\Reflection;
+
+use ArrayObject;
+
+/**
+ * A test asset extending {@see \ArrayObject}, useful for verifying internal classes issues with reflection
+ */
+class ArrayObjectExtendingClass extends ArrayObject
+{
+    /** @var mixed */
+    private $privateProperty;
+
+    /** @var mixed */
+    protected $protectedProperty;
+
+    /** @var mixed */
+    public $publicProperty;
+}

tests/Models/Reflection/ConcreteEmbeddable.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineNullableEmbeddables\Tests\Models\Reflection;
+
+/**
+ * A test asset used to check that embeddables support properties defined in abstract classes
+ */
+class ConcreteEmbeddable extends AbstractEmbeddable
+{
+    /** @var string */
+    private $propertyInConcreteClass;
+}

tests/ReflectionEmbeddedPropertyTest.php

@@ -6,10 +6,10 @@
 
 use Doctrine\Instantiator\Instantiator;
 use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty;
-use Doctrine\Tests\Models\Generic\BooleanModel;
-use Doctrine\Tests\Models\Reflection\AbstractEmbeddable;
-use Doctrine\Tests\Models\Reflection\ArrayObjectExtendingClass;
-use Doctrine\Tests\Models\Reflection\ConcreteEmbeddable;
+use DoctrineNullableEmbeddables\Tests\Models\Generic\BooleanModel;
+use DoctrineNullableEmbeddables\Tests\Models\Reflection\AbstractEmbeddable;
+use DoctrineNullableEmbeddables\Tests\Models\Reflection\ArrayObjectExtendingClass;
+use DoctrineNullableEmbeddables\Tests\Models\Reflection\ConcreteEmbeddable;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;