Merge pull request zendframework/zendframework#7342 from Martin-P/hot…

…fix/abstractoptions-variable-using-isset

Do not throw exception when isset is used on AbstractOptions existing object variable

Conflicts:
	tests/ZendTest/Stdlib/OptionsTest.php

src/AbstractOptions.php

@@ -147,7 +147,9 @@ public function __get($key)
      */
     public function __isset($key)
     {
-        return null !== $this->__get($key);
+        $getter = 'get' . str_replace('_', '', $key);
+
+        return method_exists($this, $getter) && null !== $this->__get($key);
     }
 
     /**

test/OptionsTest.php

@@ -10,9 +10,11 @@
 namespace ZendTest\Stdlib;
 
 use ArrayObject;
+use Zend\Stdlib\Exception;
 use ZendTest\Stdlib\TestAsset\TestOptions;
 use ZendTest\Stdlib\TestAsset\TestOptionsDerived;
 use ZendTest\Stdlib\TestAsset\TestOptionsNoStrict;
+use ZendTest\Stdlib\TestAsset\TestOptionsWithoutGetter;
 
 class OptionsTest extends \PHPUnit_Framework_TestCase
 {
@@ -163,4 +165,40 @@ public function testExceptionMessageContainsActualUsedSetter()
             'foo bar' => 'baz',
         ));
     }
+
+    /**
+     * @group 7287
+     */
+    public function testIssetReturnsFalseWhenMatchingGetterDoesNotExist()
+    {
+        $options = new TestOptionsWithoutGetter(array(
+            'foo' => 'bar',
+        ));
+        $this->assertFalse(isset($options->foo));
+    }
+
+    /**
+     * @group 7287
+     */
+    public function testIssetDoesNotThrowExceptionWhenMatchingGetterDoesNotExist()
+    {
+        $options   = new TestOptionsWithoutGetter();
+
+        try {
+            isset($options->foo);
+        } catch (Exception\BadMethodCallException $exception) {
+            $this->fail("Unexpected BadMethodCallException raised");
+        }
+    }
+
+    /**
+     * @group 7287
+     */
+    public function testIssetReturnsTrueWithValidDataWhenMatchingGetterDoesNotExist()
+    {
+        $options = new TestOptions(array(
+            'test_field' => 1,
+        ));
+        $this->assertTrue(isset($options->testField));
+    }
 }

test/TestAsset/TestOptionsWithoutGetter.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Stdlib\TestAsset;
+
+use Zend\Stdlib\AbstractOptions;
+
+/**
+ * Dummy TestOptions used to test Stdlib\Options
+ */
+class TestOptionsWithoutGetter extends AbstractOptions
+{
+    protected $foo;
+
+    public function setFoo($value)
+    {
+        $this->foo = $value;
+    }
+}