Merge pull request #48 from schmittjoh/array-fix

[1.5] Fix ArrayAccess on `fromArraysValue`

src/PhpOption/Option.php

@@ -18,6 +18,7 @@
 
 namespace PhpOption;
 
+use ArrayAccess;
 use IteratorAggregate;
 
 /**
@@ -57,14 +58,14 @@ public static function fromValue($value, $noneValue = null)
      *
      * Otherwise, Some is returned wrapping the value at the given key.
      *
-     * @param mixed $array a potential array value
-     * @param string $key the key to check
+     * @param mixed  $array A potential array or \ArrayAccess value.
+     * @param string $key   The key to check.
      *
      * @return Option
      */
     public static function fromArraysValue($array, $key)
     {
-        if (!is_array($array) || !isset($array[$key])) {
+        if (!(is_array($array) || $array instanceof ArrayAccess) || !isset($array[$key])) {
             return None::create();
         }
 

tests/PhpOption/Tests/OptionTest.php

@@ -28,6 +28,10 @@ public function testFromArraysValue()
         $this->assertEquals(None::create(), Option::fromArraysValue(array('foo' => 'bar'), 'baz'));
         $this->assertEquals(None::create(), Option::fromArraysValue(array('foo' => null), 'foo'));
         $this->assertEquals(new Some('foo'), Option::fromArraysValue(array('foo' => 'foo'), 'foo'));
+
+        $object = new SomeArrayObject();
+        $object['foo'] = 'foo';
+        $this->assertEquals(new Some('foo'), Option::fromArraysValue($object, 'foo'));
     }
 
     public function testFromReturn()
@@ -78,4 +82,29 @@ public function testOrElseWithMultipleAlternatives()
 
         $this->assertEquals('foo', $a->orElse($returns)->orElse($throws)->get());
     }
-}
+}
+
+class SomeArrayObject implements \ArrayAccess
+{
+    private $data = array();
+
+    public function offsetExists($offset)
+    {
+        return isset($this->data[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->data[$offset];
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}