Add trait_exists() in addition to class_exists() and interface_exists…

…() everywhere, but check function_exists('trait_exists') first. This does also merge in the pull request at #3 by paul-vg. The pull request had the OR pieces broken to multiple lines, which is reasonable.
donquixote · Jul 10, 2013 · 78c60a1 · 78c60a1
2 parents 13b278d + e49c131
commit 78c60a1
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 10 deletions.
diff --git a/src/Krautoload/ClassLoader/Pluggable.php b/src/Krautoload/ClassLoader/Pluggable.php
@@ -51,7 +51,10 @@ function loadClass($class) {
           else {
             // Assume that the file MAY define the class.
             include_once $file;
-            if (class_exists($class, FALSE) || interface_exists($class, FALSE) || trait_exists($class, FALSE)) {
+            if (class_exists($class, FALSE)
+              || interface_exists($class, FALSE)
+              || (function_exists('trait_exists') && trait_exists($class, FALSE))
+            ) {
               return TRUE;
             }
           }

diff --git a/src/Krautoload/InjectedAPI/ClassFileVisitor/IncludeEachAbstract.php b/src/Krautoload/InjectedAPI/ClassFileVisitor/IncludeEachAbstract.php
@@ -29,7 +29,7 @@ protected function includedFileWithClassCandidate($file, $relativeClassName) {
     elseif (interface_exists($class, FALSE)) {
       $this->confirmedFileWithInterface($file, $class);
     }
-    elseif (trait_exists($class, FALSE)) {
+    elseif (function_exists('trait_exists') && trait_exists($class, FALSE)) {
       $this->confirmedFileWithTrait($file, $class);
     }
   }

diff --git a/src/Krautoload/InjectedAPI/ClassFinder/LoadClass.php b/src/Krautoload/InjectedAPI/ClassFinder/LoadClass.php
@@ -22,6 +22,9 @@ function claimFile($file) {
    */
   function claimFileCandidate($file) {
     require_once $file;
-    return class_exists($this->className, FALSE) || interface_exists($this->className, FALSE) || trait_exists($this->className, FALSE);
+    return class_exists($this->className, FALSE)
+      || interface_exists($this->className, FALSE)
+      || (function_exists('trait_exists') && trait_exists($this->className, FALSE))
+    ;
   }
 }
diff --git a/src/Krautoload/InjectedAPI/ClassFinder/LoadClassGetFile.php b/src/Krautoload/InjectedAPI/ClassFinder/LoadClassGetFile.php
@@ -34,7 +34,10 @@ function guessFile($file) {
   function guessFileCandidate($file) {
     if (is_file($file)) {
       include_once $file;
-      if (class_exists($this->className, FALSE) || interface_exists($this->className, FALSE) || trait_exists($class, FALSE)) {
+      if (class_exists($this->className, FALSE)
+        || interface_exists($this->className, FALSE)
+        || (function_exists('trait_exists') && trait_exists($this->className, FALSE))
+      ) {
         $this->file = $file;
         return TRUE;
       }
@@ -55,7 +58,10 @@ function claimFile($file) {
    */
   function claimFileCandidate($file) {
     require_once $file;
-    if (class_exists($this->className, FALSE) || interface_exists($this->className, FALSE) || trait_exists($this->className, FALSE)) {
+    if (class_exists($this->className, FALSE)
+      || interface_exists($this->className, FALSE)
+      || (function_exists('trait_exists') && trait_exists($this->className, FALSE))
+    ) {
       $this->file = $file;
       return TRUE;
     }

diff --git a/src/Krautoload/NamespacePathPlugin/ShallowPSR0.php b/src/Krautoload/NamespacePathPlugin/ShallowPSR0.php
@@ -37,7 +37,10 @@ function pluginLoadClass($class, $baseDir, $relativePath) {
       // We don't know if the file defines the class,
       // and whether it was already included.
       include_once $file;
-      return class_exists($class, FALSE) || interface_exists($class, FALSE) || trait_exists($class, FALSE);
+      return class_exists($class, FALSE)
+        || interface_exists($class, FALSE)
+        || (function_exists('trait_exists') && trait_exists($class, FALSE))
+      ;
     }
   }
 

diff --git a/src/Krautoload/NamespacePathPlugin/ShallowPSR0/UseIncludePath.php b/src/Krautoload/NamespacePathPlugin/ShallowPSR0/UseIncludePath.php
@@ -35,7 +35,10 @@ function pluginLoadClass($class, $baseDir, $relativePath) {
     // We don't know if the file exists.
     if (FALSE !== $file = Util::findFileInIncludePath($baseDir . $relativePath)) {
       include_once $file;
-      return class_exists($class, FALSE) || interface_exists($class, FALSE) || trait_exists($class, FALSE);
+      return class_exists($class, FALSE)
+        || interface_exists($class, FALSE)
+        || (function_exists('trait_exists') && trait_exists($class, FALSE))
+      ;
     }
   }
 

diff --git a/src/Krautoload/PrefixPathPlugin/ShallowPEAR/Uncertain.php b/src/Krautoload/PrefixPathPlugin/ShallowPEAR/Uncertain.php
@@ -11,7 +11,10 @@ function pluginFindFile($api, $baseDir, $relativePath) {
   function pluginLoadClass($class, $baseDir, $relativePath) {
     if (is_file($file = $baseDir . $relativePath)) {
       include_once $file;
-      return class_exists($class, FALSE) || interface_exists($class, FALSE) || trait_exists($class, FALSE);
+      return class_exists($class, FALSE)
+        || interface_exists($class, FALSE)
+        || (function_exists('trait_exists') && trait_exists($class, FALSE))
+      ;
     }
   }
 }
diff --git a/src/Krautoload/PrefixPathPlugin/ShallowPEAR/UseIncludePath.php b/src/Krautoload/PrefixPathPlugin/ShallowPEAR/UseIncludePath.php
@@ -21,7 +21,10 @@ function pluginLoadClass($class, $baseDir, $relativePath) {
     // We don't know if the file exists.
     if (FALSE !== $file = Util::findFileInIncludePath($baseDir . $relativePath)) {
       include_once $file;
-      return class_exists($class, FALSE) || interface_exists($class, FALSE) || trait_exists($class, FALSE);
+      return class_exists($class, FALSE)
+        || interface_exists($class, FALSE)
+        || (function_exists('trait_exists') && trait_exists($class, FALSE))
+      ;
     }
   }
 }
diff --git a/src/Krautoload/Util.php b/src/Krautoload/Util.php
@@ -18,6 +18,7 @@ static function calledFromClassExists() {
           case 'class_exists':
           case 'interface_exists':
           case 'method_exists':
+          case 'trait_exists':
           case 'is_callable':
           // @todo Add more cases.
             return TRUE;
@@ -29,7 +30,10 @@ static function calledFromClassExists() {
   }
 
   static function classIsDefined($class) {
-    return class_exists($class, FALSE) || interface_exists($class, FALSE) || trait_exists($class, FALSE);
+    return class_exists($class, FALSE)
+      || interface_exists($class, FALSE)
+      || (function_exists('trait_exists') && trait_exists($class, FALSE))
+    ;
   }
 
   /**