Merge commit 'd943eeb14557c0468720e4cfddef5eb6950b264b'

tot-ra · Dec 3, 2014 · 2aca0fd · 2aca0fd
2 parents 483f363 + d943eeb
commit 2aca0fd
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/PHPCI/Plugin/Util/FilesPluginInformation.php
@@ -67,7 +67,7 @@ protected function loadPluginInfo()
         $this->pluginInfo = array();
         foreach ($this->files as $fileInfo) {
             if ($fileInfo instanceof \SplFileInfo) {
-                if ($fileInfo->isFile()) {
+                if ($fileInfo->isFile() && $fileInfo->getExtension()=='php') {
                     $this->addPluginFromFile($fileInfo);
                 }
             }
@@ -93,12 +93,17 @@ protected function getFullClassFromFile(\SplFileInfo $fileInfo)
 
         $matches = array();
         preg_match('#class +([A-Za-z]+) +implements#i', $contents, $matches);
-        $className = $matches[1];
-
-        $matches = array();
-        preg_match('#namespace +([A-Za-z\\\\]+);#i', $contents, $matches);
-        $namespace = $matches[1];
-
-        return $namespace . '\\' . $className;
+        if(isset($matches[1])){
+            $className = $matches[1];
+
+            $matches = array();
+            preg_match('#namespace +([A-Za-z\\\\]+);#i', $contents, $matches);
+            $namespace = $matches[1];
+
+            return $namespace . '\\' . $className;
+        }
+        else{
+            echo 'Unable to load plugin info from '.$fileInfo->getRealPath();
+        }
     }
 }