Merge remote-tracking branch 'weierophinney/hotfix/is-subclass-of-opt…

…imization'
zendframework · Jul 13, 2012 · 7465e5d · 7465e5d
5 parents 92b6722 + 1d54f79 + 1b64e7d + 1f50979 + 97b2e50
commit 7465e5d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Di.php b/src/Di.php
@@ -723,12 +723,12 @@ protected function getClass($instance)
      */
     protected static function isSubclassOf($className, $type)
     {
-        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
-            return is_subclass_of($className, $type);
-        }
         if (is_subclass_of($className, $type)) {
             return true;
         }
+        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
+            return false;
+        }
         if (!interface_exists($type)) {
             return false;
         }