Merge branch 'make-isset-check-methods' of github.com:BenConstable/presenter into develop closes #25

Author: robclancy

src/Robbo/Presenter/Presenter.php

@@ -77,6 +77,12 @@ public function offsetExists($offset)
         // We only check isset on the array, if it is an object we return true as the object could be overloaded
         if (is_array($this->object))
         {
+            if ($method = $this->getPresentMethodForVariable($offset))
+            {
+                $result = $this->$method();
+                return isset($result);
+            }
+
             return isset($this->object[$offset]);
         }
 
@@ -137,8 +143,7 @@ public function offsetUnset($offset)
      */
     public function __get($var)
     {
-        $method = 'present'.str_replace(' ', '', ucwords(str_replace(array('-', '_'), ' ', $var)));
-        if (method_exists($this, $method))
+        if ($method = $this->getPresentMethodForVariable($var))
         {
             return $this->$method();
         }
@@ -173,6 +178,12 @@ public function __call($method, $arguments)
      */
     public function __isset($name)
     {
+        if ($method = $this->getPresentMethodForVariable($name))
+        {
+            $result = $this->$method();
+            return isset($result);
+        }
+
         if (is_array($this->object))
         {
             return isset($this->object[$name]);
@@ -197,4 +208,21 @@ public function __unset($name)
         unset($this->object->$name);
     }
 
+    /**
+     * Fetch the 'present' method name for the given variable.
+     *
+     * @param  string      $var Variable name
+     * @return string|null      Present method name, or null if method does not exist
+     */
+    private function getPresentMethodForVariable($var)
+    {
+        $method = 'present'.str_replace(' ', '', ucwords(str_replace(array('-', '_'), ' ', $var)));
+
+        if (method_exists($this, $method)) {
+            return $method;
+        } else {
+            return null;
+        }
+    }
+
 }

tests/PresenterTest.php

@@ -71,11 +71,21 @@ public function testArrayIsset()
 
         $this->assertTrue(isset($presenter['testVar']));
         $this->assertFalse(isset($presenter['unsetVar']));
+        $this->assertTrue(isset($presenter['awesome']));
 
         $presenter = new PresenterStub(new InjectStub);
         $this->assertTrue(isset($presenter['unsetVar']));
     }
 
+    public function testObjectIsset()
+    {
+        $presenter = new PresenterStub(new InjectStub);
+
+        $this->assertTrue(isset($presenter->testVar));
+        $this->assertTrue(isset($presenter->awesome));
+        $this->assertFalse(isset($presenter->unsetVar));
+    }
+
     public function testArraySet()
     {
         $presenter = new PresenterStub(array('testVar' => 'testvar'));