maybe nullable defaults

Author: devosc

src/Plugin/MaybeTest.php

@@ -9,6 +9,7 @@
 use Mvc5\Plugin\Maybe;
 use Mvc5\Plugin\Nothing;
 use Mvc5\Plugin\Nullable;
+use Mvc5\Plugin\Plug;
 use Mvc5\Plugin\Plugin;
 use Mvc5\Test\Test\TestCase;
 
@@ -24,46 +25,50 @@ function test()
 
         $this->assertEquals([$maybe, '__invoke'], $maybe->config());
         $this->assertEquals(['foo'], $maybe->args());
+        $this->assertInstanceOf(Nothing::class, (new Maybe)());
     }
 
     /**
      *
      */
-    function test_plugin_returns_false()
+    function test_custom_default()
     {
-        $app = new App(['services' => [
-            'foo' => new Maybe(false)
-        ]]);
+        $this->assertEquals('bar', (new App)(new Maybe(null, 'bar')));
+    }
 
-        $this->assertFalse($app['foo']);
-        $this->assertFalse($app->plugin('foo'));
+    /**
+     *
+     */
+    function test_default()
+    {
+        $this->assertInstanceOf(Nothing::class, (new Maybe)());
     }
 
     /**
      *
      */
-    function test_plugin_returns_null()
+    function test_null()
     {
         $app = new App(['services' => [
             'foo' => new Maybe(null),
             'foobar' => new Nullable(new Plugin('foo'))
         ]]);
 
-        $this->assertNull($app['foobar']);
         $this->assertInstanceOf(Nothing::class, $app['foo']);
-        $this->assertInstanceOf(Nothing::class, $app->plugin('foo'));
+        $this->assertNull($app['foobar']);
     }
 
     /**
      *
      */
-    function test_plugin_returns_something()
+    function test_not_null()
     {
         $app = new App(['services' => [
-            'foo' => new Maybe('foobar')
+            'foo' => new Maybe('foobar'),
+            'foobar' => new Nullable(new Plug('foo'))
         ]]);
 
         $this->assertEquals('foobar', $app['foo']);
-        $this->assertEquals('foobar', $app->plugin('foo'));
+        $this->assertEquals('foobar', $app['foobar']);
     }
 }

src/Plugin/NullableTest.php

@@ -24,12 +24,29 @@ function test()
 
         $this->assertEquals([$maybe, '__invoke'], $maybe->config());
         $this->assertEquals(['foo'], $maybe->args());
+        $this->assertNull((new Nullable)());
     }
 
     /**
      *
      */
-    function test_shared_null_value()
+    function test_custom_default()
+    {
+        $this->assertEquals('bar', (new App)(new Nullable(new Maybe, 'bar')));
+   }
+
+    /**
+     *
+     */
+    function test_default()
+    {
+        $this->assertEquals(null, (new App)(new Nullable));
+    }
+
+    /**
+     *
+     */
+    function test_null_value()
     {
         $count = 0;
 
@@ -47,4 +64,26 @@ function test_shared_null_value()
         $this->assertNull($app['foobar']);
         $this->assertEquals(1, $count);
     }
+
+    /**
+     *
+     */
+    function test_value_not_null()
+    {
+        $count = 0;
+
+        $app = new App(['services' => [
+            'foo' => new Maybe(new Call(function() use (&$count) {
+                ++$count;
+                return 'bar';
+            })),
+            'foobar' => new Nullable(new Shared('foo'))
+        ]]);
+
+        $this->assertEquals('bar', $app->plugin('foobar'));
+        $this->assertEquals('bar', $app->shared('foobar'));
+        $this->assertEquals('bar', $app->get('foobar'));
+        $this->assertEquals('bar', $app['foobar']);
+        $this->assertEquals(1, $count);
+    }
 }