Fix for FilesPluginInformation trying to load external files, like .D…

…S_Store Notice: Undefined offset: 1 in /Users/artjom/PhpstormProjects/PHPCI/PHPCI/Plugin/Util/FilesPluginInformation.php on line 99
tot-ra · Nov 7, 2014 · d943eeb · d943eeb
1 parent aaee968
commit d943eeb
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();
+        }
     }
 }