From c0bd7efe3930aa3da0b10de20a454aedc2da0541 Mon Sep 17 00:00:00 2001
From: Justin Hileman <justin@justinhileman.info>
Date: Mon, 18 Aug 2014 16:56:32 -0700
Subject: [PATCH] No need for elseif with returns :)

/cc @keradus
---
 src/Mustache/Compiler.php | 10 ++++++----
 src/Mustache/Context.php  |  8 ++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Mustache/Compiler.php b/src/Mustache/Compiler.php
index 9161c64..285287c 100644
--- a/src/Mustache/Compiler.php
+++ b/src/Mustache/Compiler.php
@@ -631,11 +631,13 @@ class Mustache_Compiler
     {
         if ($id === '.') {
             return 'last';
-        } elseif (strpos($id, '.') === false) {
-            return 'find';
-        } else {
-            return 'findDot';
         }
+
+        if (strpos($id, '.') === false) {
+            return 'find';
+        }
+
+        return 'findDot';
     }
 
     const IS_CALLABLE        = '!is_string(%s) && is_callable(%s)';
diff --git a/src/Mustache/Context.php b/src/Mustache/Context.php
index b16b400..db03acc 100644
--- a/src/Mustache/Context.php
+++ b/src/Mustache/Context.php
@@ -181,9 +181,13 @@ class Mustache_Context
                         // See https://github.com/bobthecow/mustache.php/wiki/Magic-Methods
                         if (method_exists($frame, $id)) {
                             return $frame->$id();
-                        } elseif (isset($frame->$id)) {
+                        }
+
+                        if (isset($frame->$id)) {
                             return $frame->$id;
-                        } elseif ($frame instanceof ArrayAccess && isset($frame[$id])) {
+                        }
+
+                        if ($frame instanceof ArrayAccess && isset($frame[$id])) {
                             return $frame[$id];
                         }
                     }