Support for traits in autoloaders

Author: Marek Kilimajer

lib/autoload/sfCoreAutoload.class.php

@@ -163,7 +163,9 @@ static public function make()
       $class = basename($file, false === strpos($file, '.class.php') ? '.php' : '.class.php');
 
       $contents = file_get_contents($file);
-      if (false !== stripos($contents, 'class '.$class) || false !== stripos($contents, 'interface '.$class))
+      if (false !== stripos($contents, 'class '.$class)
+          || false !== stripos($contents, 'interface '.$class)
+          || false !== stripos($contents, 'trait '.$class))
       {
         $classes .= sprintf("    '%s' => '%s',\n", strtolower($class), substr(str_replace($libDir, '', $file), 1));
       }

lib/autoload/sfSimpleAutoload.class.php

@@ -286,7 +286,7 @@ public function addFile($file, $register = true)
       $this->cacheChanged = true;
     }
 
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface)\s+(\w+)~mi', file_get_contents($file), $classes);
+    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
     foreach ($classes[1] as $class)
     {
       $this->classes[strtolower($class)] = $file;

lib/config/sfAutoloadConfigHandler.class.php

@@ -126,7 +126,7 @@ protected function parse(array $configFiles)
   static public function parseFile($path, $file, $prefix)
   {
     $mapping = array();
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface)\s+(\w+)~mi', file_get_contents($file), $classes);
+    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
     foreach ($classes[1] as $class)
     {
       $localPrefix = '';