Merge pull request #10 from CodinPro/bug-9

Bug 9

Author: uLow

src/DTOAccessorTrait.php

@@ -39,7 +39,7 @@ public function offsetExists($offset)
      */
     private function offsetGetScalar($offset)
     {
-        if (isset($this->data[$offset])) {
+        if (array_key_exists($offset, $this->data)) {
             return $this->data[$offset];
         }
 
@@ -54,7 +54,7 @@ private function offsetGetScalar($offset)
      */
     private function getDefaultValue($offset)
     {
-        if (isset($this->default[$offset])) {
+        if (array_key_exists($offset, $this->default)) {
             return $this->default[$offset];
         }
 

src/ExampleDTO.php

@@ -7,4 +7,5 @@ class ExampleDTO extends DTO
     protected $foo = true;
     protected $bar = 'string';
     protected $extra = ['a' => 'b'];
+    protected $some;
 }

tests/ExampleDTOTest.php

@@ -11,6 +11,7 @@ public function testBuildFromArray()
         $this->assertEquals(true, $dto->get('foo'));
         $this->assertEquals('string', $dto->get('bar'));
         $this->assertEquals(['a' => 'b'], $dto->get('extra'));
+        $this->assertEquals(null, $dto->get('some'));
     }
 
     public function testBuildFromJson()
@@ -77,7 +78,7 @@ public function testCount()
     {
         $dto = new ExampleDTO();
 
-        $this->assertCount(3, $dto);
+        $this->assertCount(4, $dto);
     }
 
     public function testOffsetExists()
@@ -136,22 +137,22 @@ public function testToString()
     {
         $dto = new ExampleDTO();
 
-        $this->assertEquals('{"foo":true,"bar":"string","extra":{"a":"b"}}', (string)$dto);
+        $this->assertEquals('{"foo":true,"bar":"string","extra":{"a":"b"},"some":null}', (string)$dto);
     }
 
     public function testToStringWithCustomSerializer()
     {
         $dto = new ExampleDTO();
         $dto->setSerializer(new CustomSerializer());
 
-        $this->assertEquals('a:3:{s:3:"foo";b:1;s:3:"bar";s:6:"string";s:5:"extra";a:1:{s:1:"a";s:1:"b";}}', (string)$dto);
+        $this->assertEquals('a:4:{s:3:"foo";b:1;s:3:"bar";s:6:"string";s:5:"extra";a:1:{s:1:"a";s:1:"b";}s:4:"some";N;}', (string)$dto);
     }
 
     public function testCanIterateDTO()
     {
         $dto = new ExampleDTO();
 
-        $expectedArray = ['foo' => true, 'bar' => 'string', 'extra' => ['a' => 'b']];
+        $expectedArray = ['foo' => true, 'bar' => 'string', 'extra' => ['a' => 'b'], 'some' => null];
         $gotArray = [];
 
         foreach ($dto as $key => $value) {