Handling optionals created with nulls.

Author: assertchris

source/Optional.php

@@ -31,11 +31,13 @@ public function __construct($value)
      */
     public function value(callable $then = null)
     {
-        if (is_callable($then)) {
-            $then($this->value);
-        }
+        if ($this->isNotNone($this->value)) {
+            if (is_callable($then)) {
+                $then($this->value);
+            }
 
-        return $this->value;
+            return $this->value;
+        }
     }
 
     /**
@@ -54,9 +56,9 @@ public function __call($method, $parameters)
             if ($this->isNotNone($result)) {
                 return new Optional($result);
             }
-        }
 
-        return new None();
+            return new None();
+        }
     }
 
     /**
@@ -87,6 +89,11 @@ protected function isNotNone($result)
      */
     public function none(callable $then = null)
     {
+        if (!$this->isNotNone($this->value)) {
+            $then();
+            return;
+        }
+
         return $this;
     }
 }

tests/OptionalTest.php

@@ -113,4 +113,26 @@ public function itSquashesNestedOptionals()
             $optional->value()
         );
     }
+
+    /**
+     * @test
+     *
+     * @return void
+     */
+    public function itHandlesOptionalsCreatedWithNulls()
+    {
+        $optional = new Optional(null);
+
+        $optional->value(function() {
+            $this->fail("Value should not be called here.");
+        });
+
+        $flag = false;
+
+        $optional->none(function() use (&$flag) {
+            $flag = true;
+        });
+
+        $this->assertTrue($flag);
+    }
 }