Add optional type (#17)

* Add optional type

Resolve #16

* Use php5 compatible version

Author: Christian Blank

.travis.yml

@@ -17,4 +17,5 @@ install:
   - composer install
 
 script:
-   - vendor/bin/phpspec run --no-interaction
+   - vendor/bin/phpspec run --no-interaction
+   - vendor/bin/phpunit tests

README.md

@@ -71,6 +71,7 @@ Currently the following types are supported:
  * List
  * Datetime
  * Regex
+ * Optional
 
 There are some open issues with ideas for more types. Feel free to send pull requests.
 

composer.json

@@ -13,12 +13,16 @@
         }
     ],
     "require-dev": {
-        "phpspec/phpspec": "^3.2"
+        "phpspec/phpspec": "^3.2",
+        "phpunit/phpunit": "^5.6"
     },
     "autoload": {
         "psr-4": {
             "StructureCheck\\": [
                 "src"
+            ],
+            "StructureCheck\\Test\\": [
+                "tests"
             ]
         }
     }

spec/Type/OptionalTypeSpec.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace spec\StructureCheck\Type;
+
+use StructureCheck\Result;
+use StructureCheck\Type\OptionalType;
+use PhpSpec\ObjectBehavior;
+use StructureCheck\Type\TypeInterface;
+
+class OptionalTypeSpec extends ObjectBehavior
+{
+    function it_is_initializable(TypeInterface $childType)
+    {
+        $this->beConstructedWith($childType);
+        $this->shouldHaveType(OptionalType::class);
+    }
+
+    function it_should_return_the_value_from_the_child(TypeInterface $childType) {
+        $this->beConstructedWith($childType);
+        $childType->check(false)->willReturn(new Result(false, []));
+        $this->check(false)->isValid()->shouldBe(false);
+    }
+}

src/Check/CountCheck.php

@@ -55,14 +55,14 @@ public function check($value)
             return $result;
         }
 
-        if ($value instanceof Countable) {
+        if (!$value instanceof Countable) {
             return new Result(
                 false,
                 [sprintf(self::$countableErrorMessage, json_encode($value))]
             );
         }
 
-        if (count($value) === $this->count) {
+        if (count($value) !== $this->count) {
             return new Result(
                 false,
                 [sprintf(self::$countErrorMessage, json_encode($value), $this->count)]

src/Type/ObjectType.php

@@ -33,8 +33,10 @@ public function check($value)
 
         foreach ($this->children as $key => $child) {
             if (!array_key_exists($key, $value)) {
-                $valid = false;
-                $errors[] = sprintf(self::$missingKeyErrorMessage, $key);
+                if (!$child instanceof OptionalType) {
+                    $valid = false;
+                    $errors[] = sprintf(self::$missingKeyErrorMessage, $key);
+                }
 
                 continue;
             }

src/Type/OptionalType.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace StructureCheck\Type;
+
+use StructureCheck\ResultInterface;
+
+/**
+ * Class OptionalType
+ * @package StructureCheck\Type
+ * @author Christian Blank <christian@cubicl.de>
+ */
+class OptionalType implements TypeInterface
+{
+    /**
+     * @var TypeInterface
+     */
+    private $child;
+
+    /**
+     * OptionalType constructor.
+     * @param TypeInterface $child
+     */
+    public function __construct(TypeInterface $child)
+    {
+        $this->child = $child;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return ResultInterface
+     */
+    public function check($value)
+    {
+        return $this->child->check($value);
+    }
+}

tests/Integration/Type/ObjectTypeTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace StructureCheck\Test\Integration\Type;
+
+use PHPUnit\Framework\TestCase;
+use StructureCheck\Checker;
+use StructureCheck\CheckerInterface;
+use StructureCheck\Type\AnyType;
+use StructureCheck\Type\ObjectType;
+use StructureCheck\Type\OptionalType;
+
+/**
+ * Class ObjectTypeTest
+ * @package StructureCheck\Test\Integration\Type
+ * @author Christian Blank <christian@cubicl.de>
+ */
+class ObjectTypeTest extends TestCase
+{
+    /**
+     * @var CheckerInterface
+     */
+    private $checker;
+
+    /**
+     *
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->checker = new Checker();
+    }
+
+    /**
+     * @test
+     */
+    public function itShouldHandleAbsenceOfOptionalDeclaredType()
+    {
+        $structure = new ObjectType([
+            'opt' => new OptionalType(new AnyType())
+        ]);
+
+        $actual = $structure->check([]);
+
+        $this->assertSame(true, $actual->isValid());
+    }
+}