Improve exception message of ExtractionException

akeneo · Jun 20, 2017 · 392d04f · 392d04f
1 parent b28567f
commit 392d04f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/src/Akeneo/CouplingDetector/NodeParser/NodeParserInterface.php b/src/Akeneo/CouplingDetector/NodeParser/NodeParserInterface.php
@@ -15,9 +15,9 @@ interface NodeParserInterface
     /**
      * @param \SplFileInfo $file
      *
-     * @return NodeInterface
+     * @return Node
      *
-     * @throws ExtractionException
+     * @throws ParsingException
      */
     public function parse(\SplFileInfo $file);
 }
diff --git a/src/Akeneo/CouplingDetector/NodeParser/ParsingException.php b/src/Akeneo/CouplingDetector/NodeParser/ParsingException.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Akeneo\CouplingDetector\NodeParser;
+
+/**
+ * Class ParsingException.
+ *
+ * @author    Pierre Allard <pierre.allard@akeneo.com>
+ * @copyright 2017 Akeneo SAS (http://www.akeneo.com)
+ * @license   http://opensource.org/licenses/MIT MIT
+ */
+class ParsingException extends \LogicException
+{
+}
diff --git a/src/Akeneo/CouplingDetector/NodeParser/PhpClassNodeParser.php b/src/Akeneo/CouplingDetector/NodeParser/PhpClassNodeParser.php
@@ -20,6 +20,9 @@
  */
 class PhpClassNodeParser implements NodeParserInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function parse(\SplFileInfo $file)
     {
         $namespaceExtractor = new NamespaceExtractor();
@@ -28,8 +31,16 @@ public function parse(\SplFileInfo $file)
 
         $content = file_get_contents($file->getRealPath());
         $tokens = Tokens::fromCode($content);
-        $classNamespace = $namespaceExtractor->extract($tokens);
-        $className = $classNameExtractor->extract($tokens);
+        try {
+            $classNamespace = $namespaceExtractor->extract($tokens, $file);
+            $className = $classNameExtractor->extract($tokens, $file);
+        } catch (ExtractionException $e) {
+            throw new ParsingException(sprintf(
+                "Parsing exception on \"%s\":\n%s",
+                $file->getPathname(),
+                $e->getMessage()
+            ));
+        }
         $classFullName = sprintf('%s\%s', $classNamespace, $className);
         $useDeclarations = $useDeclarationExtractor->extract($tokens);