Merge pull request naneau#34 from entrypass/resume-on-error

Option to resume on error

Author: naneau

src/Naneau/Obfuscator/Console/Command/ObfuscateCommand.php

@@ -12,6 +12,7 @@
 
 use Naneau\Obfuscator\Obfuscator;
 use Naneau\Obfuscator\Obfuscator\Event\File as FileEvent;
+use Naneau\Obfuscator\Obfuscator\Event\FileError as FileErrorEvent;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -70,6 +71,11 @@ protected function configure()
                 null,
                 InputOption::VALUE_NONE,
                 'Leave whitespace in output?'
+            )->addOption(
+                'ignore_error',
+                null,
+                InputOption::VALUE_NONE,
+                'Continue processing the next file when error is encountered'
             )->addOption(
                 'config',
                 null,
@@ -113,6 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Strip whitespace?
         $stripWhitespace = !$input->getOption('leave_whitespace');
+        $ignoreError = !!$input->getOption('ignore_error');
 
         // Show every file
         $this->getObfuscator()->getEventDispatcher()->addListener(
@@ -124,9 +131,25 @@ function(FileEvent $event) use ($output, $directory) {
                 ));
             }
         );
+        // Show error processing file
+        if($ignoreError) {
+            $this->getObfuscator()->getEventDispatcher()->addListener(
+                'obfuscator.file.error',
+                function(FileErrorEvent $event) use ($output, $directory) {
+                    $output->writeln(sprintf(
+                        'Error obfuscating <error>%s</error>',
+                        substr($event->getFile(), strlen($directory))
+                    ));
+                    $output->writeln(sprintf(
+                        'Parsing error: <error>%s</error>', $event->getErrorMessage()
+                    ));
+                }
+            );
+        }
 
         // Actual obfuscation
-        $this->getObfuscator()->obfuscate($directory, $stripWhitespace);
+        $this->getObfuscator()->obfuscate($directory, $stripWhitespace,
+            $ignoreError);
     }
 
     /**

src/Naneau/Obfuscator/Obfuscator.php

@@ -9,6 +9,7 @@
 namespace Naneau\Obfuscator;
 
 use Naneau\Obfuscator\Obfuscator\Event\File as FileEvent;
+use Naneau\Obfuscator\Obfuscator\Event\FileError as FileErrorEvent;
 
 use PhpParser\NodeTraverserInterface as NodeTraverser;
 
@@ -78,7 +79,8 @@ class Obfuscator
      * @param  bool   $stripWhitespace
      * @return void
      **/
-    public function obfuscate($directory, $stripWhitespace = false)
+    public function obfuscate($directory, $stripWhitespace = false,
+        $ignoreError = false)
     {
         foreach ($this->getFiles($directory) as $file) {
             $this->getEventDispatcher()->dispatch(
@@ -87,7 +89,8 @@ public function obfuscate($directory, $stripWhitespace = false)
             );
 
             // Write obfuscated source
-            file_put_contents($file, $this->obfuscateFileContents($file));
+            file_put_contents($file, $this->obfuscateFileContents($file,
+                $ignoreError));
 
             // Strip whitespace if required
             if ($stripWhitespace) {
@@ -230,9 +233,11 @@ private function getFiles($directory)
      * Obfuscate a single file's contents
      *
      * @param  string $file
+     * @param  boolean $ignoreError if true, do not throw an Error and 
+     *                              exit, but continue with next file
      * @return string obfuscated contents
      **/
-    private function obfuscateFileContents($file)
+    private function obfuscateFileContents($file, $ignoreError)
     {
         try {
             // Input code
@@ -245,11 +250,19 @@ private function obfuscateFileContents($file)
 
             return "<?php\n" . $this->getPrettyPrinter()->prettyPrint($ast);
         } catch (Exception $e) {
-            throw new Exception(
-                sprintf('Could not parse file "%s"', $file),
-                null,
-                $e
-            );
+            if($ignoreError) {
+                sprintf('Could not parse file "%s"', $file);
+                $this->getEventDispatcher()->dispatch(
+                    'obfuscator.file.error',
+                    new FileErrorEvent($file, $e->getMessage())
+                );
+            } else {
+                throw new Exception(
+                    sprintf('Could not parse file "%s"', $file),
+                    null,
+                    $e
+                );
+            }
         }
     }
 }

src/Naneau/Obfuscator/Obfuscator/Event/FileError.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * The file that handles parsing error events
+ *
+ * @package         Obfuscator
+ * @subpackage      Obfuscator
+ */
+
+namespace Naneau\Obfuscator\Obfuscator\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+use Naneau\Obfuscator\Obfuscator\Event\File;
+
+/**
+ * FileError
+ *
+ * The file being obfuscated that causes an error
+ *
+ * @category        Naneau
+ * @package         Obfuscator
+ * @subpackage      Obfuscator
+ */
+class FileError extends File
+{
+    /**
+     * The error message from Exception
+     * @var string
+     **/
+    private $errorMessage;
+
+    /**
+     * Constructor
+     *
+     * @param string $file
+     * @return void
+     **/
+    public function __construct($file, $errorMessage)
+    {
+        parent::setFile($file);
+        $this->errorMessage = $errorMessage;
+    }
+
+    /**
+     * Get the error message
+     *
+     * @return string
+     */
+    public function getErrorMessage()
+    {
+        return $this->errorMessage;
+    }
+}