Verbosity of exceptions during analysis

phpmetrics · Feb 16, 2015 · f351a97 · f351a97
1 parent 4e1b60e
commit f351a97
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Hal/Application/Command/Job/DoAnalyze.php b/src/Hal/Application/Command/Job/DoAnalyze.php
@@ -117,7 +117,18 @@ public function execute(ResultCollection $collection, ResultCollection $aggregat
             }
 
             // Analyze
-            $resultSet = $fileAnalyzer->execute($filename);
+            try {
+                $resultSet = $fileAnalyzer->execute($filename);
+            } catch(\Exception $e) {
+                throw new \Exception(
+                    (
+                        sprintf("a '%s' exception occured analyzing file %s\nMessage: %s", get_class($e), $filename, $e->getMessage())
+                        . sprintf("\n------------\nStack:\n%s", $e->getTraceAsString())
+                        . sprintf("\n------------\nDo not hesitate to report a bug: https://github.com/Halleck45/PhpMetrics/issues")
+                    )
+                , 0, $e->getPrevious());
+            }
+
             $collection->push($resultSet);
         }
 

diff --git a/src/Hal/Component/OOP/Extractor/MethodExtractor.php b/src/Hal/Component/OOP/Extractor/MethodExtractor.php
@@ -48,7 +48,7 @@ public function extract(&$n, TokenCollection $tokens)
     {
         $declaration = $this->searcher->getUnder(array(')'), $n, $tokens);
         if(!preg_match('!function\s+(.*)\(\s*(.*)!is', $declaration, $matches)) {
-            throw new \Exception('Closure detected instead of method');
+            throw new \Exception(sprintf("Closure detected instead of method\nDetails:\n%s", $declaration));
         }
         list(, $name, $args) = $matches;
         $method = new ReflectedMethod($name);