Added $nullable option in HasOneStrateg/HasManyStrategy (default to

true)
matryoshka-model · Jun 24, 2015 · 13c79e9 · 13c79e9
1 parent b6d5a3e
commit 13c79e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/library/Hydrator/Strategy/HasManyStrategy.php b/library/Hydrator/Strategy/HasManyStrategy.php
@@ -35,13 +35,16 @@ class HasManyStrategy implements StrategyInterface, NullableStrategyInterface
      *
      * @param HydratorAwareInterface $objectPrototype
      * @param \ArrayAccess $arrayObjectPrototype
+     * @param bool $nullable
      */
     public function __construct(
         HydratorAwareInterface $objectPrototype,
-        \ArrayAccess $arrayObjectPrototype = null
+        \ArrayAccess $arrayObjectPrototype = null,
+        $nullable = true
     ) {
         $this->hasOneStrategy = new HasOneStrategy($objectPrototype);
         $this->arrayObjectPrototype = $arrayObjectPrototype ? $arrayObjectPrototype : new ArrayObject([], ArrayObject::ARRAY_AS_PROPS);
+        $this->setNullable($nullable);
     }
 
     /**

diff --git a/library/Hydrator/Strategy/HasOneStrategy.php b/library/Hydrator/Strategy/HasOneStrategy.php
@@ -27,9 +27,10 @@ class HasOneStrategy implements StrategyInterface, NullableStrategyInterface
     /**
      * Ctor
      *
-     * @param $objectPrototype
+     * @param HydratorAwareInterface $objectPrototype
+     * @param bool $nullable
      */
-    public function __construct(HydratorAwareInterface $objectPrototype, $nullable = false)
+    public function __construct(HydratorAwareInterface $objectPrototype, $nullable = true)
     {
         $this->objectPrototype = $objectPrototype;
         $this->setNullable($nullable);

diff --git a/tests/Hydrator/Strategy/HasOneStrategyTest.php b/tests/Hydrator/Strategy/HasOneStrategyTest.php
@@ -19,7 +19,7 @@ class HasOneStrategyTest extends \PHPUnit_Framework_TestCase
     public function testConstructor()
     {
         $abstractObject = $this->getMockForAbstractClass('\Matryoshka\Model\Object\AbstractObject');
-        $strategy = new HasOneStrategy($abstractObject, new \ArrayObject());
+        $strategy = new HasOneStrategy($abstractObject);
         $this->assertInstanceOf('Matryoshka\Model\Hydrator\Strategy\NullableStrategyInterface', $strategy);
         $this->assertTrue($strategy->isNullable());
     }