Now we can set a default value for tryGet method

italolelis · Nov 29, 2013 · 12de375 · 12de375
1 parent 1c6842e
commit 12de375
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/CollectionArray.php b/CollectionArray.php
@@ -133,10 +133,10 @@ public function get($index)
     /**
      * {@inheritdoc}
      */
-    public function tryGet($index)
+    public function tryGet($index, $default = null)
     {
         if ($this->offsetExists($index) === false) {
-            return null;
+            return $default;
         }
 
         return $this->get($index);

diff --git a/Test/DictionaryTest.php b/Test/DictionaryTest.php
@@ -66,6 +66,27 @@ public function testSetNullKey()
         $this->coll->set(null, 'testing');
     }
 
+    public function testTryGetSuccess()
+    {
+        $this->coll->add('key', 'testing');
+        $value = $this->coll->tryGet('key');
+        $this->assertEquals('testing', $value);
+    }
+
+    public function testTryGetError()
+    {
+        $this->coll->add('key', 'testing');
+        $value = $this->coll->tryGet('key2');
+        $this->assertNull($value);
+    }
+
+    public function testTryGetDefaultValue()
+    {
+        $this->coll->add('key', 'testing');
+        $value = $this->coll->tryGet('key2', 'testingValue');
+        $this->assertEquals('testingValue', $value);
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */