Pull request naneau#15 (Added Native PHP Copy Support)

Author: sha1

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

@@ -12,7 +12,6 @@
 
 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;
@@ -71,23 +70,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,
                 InputOption::VALUE_REQUIRED,
                 'Configuration file to use'
-            )->addOption(
-                'memory_limit',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'Runtime memory when running the obsfucator. ' .
-                'Example: 128M ' .
-                'See http://php.net/manual/en/ini.core.php#ini.memory-limit'
             );
 
         $this->setContainer(new Container);
@@ -105,10 +92,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Finalize the container
         $this->finalizeContainer($input);
 
-        // Change runtime memory
-        if($memory = $input->getOption('memory_limit')) {
-            ini_set("memory_limit", $memory);
-        }
         // Input/output dirs
         $inputDirectory = $input->getArgument('input_directory');
         $outputDirectory = $input->getArgument('output_directory');
@@ -130,7 +113,6 @@ 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(
@@ -142,25 +124,9 @@ 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,
-            $ignoreError);
+        $this->getObfuscator()->obfuscate($directory, $stripWhitespace);
     }
 
     /**
@@ -205,27 +171,39 @@ public function getObfuscator()
      **/
     private function copyDir($from, $to)
     {
-        // FIXME implement native copy
-        $output = array();
-        $return = 0;
-
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            // WINDOWS
-            $command = sprintf('XCOPY "%s" "%s" /hievry', $from, $to);
-        } else {
-            // *NIX
-            $command = sprintf('cp -rf %s %s', $from, $to);
-        }        
+        $this->copyDirectory($from, $to);
 
-        exec($command, $output, $return);
-
-        if ($return !== 0)  {
+        if (!is_dir($to))  {
             throw new \Exception('Could not copy directory');
         }
 
         return $this;
     }
 
+    /**
+     * Recursively copy a directory
+     *
+     * @param string $src
+     * @param string $dst
+     * @return void
+     **/
+    private function copyDirectory($src,$dst)
+    {
+        $dir = opendir($src);
+        @mkdir($dst);
+        while(false !== ( $file = readdir($dir)) ) {
+            if (( $file != '.' ) && ( $file != '..' )) {
+                if ( is_dir($src . '/' . $file) ) {
+                    $this->copyDirectory($src . '/' . $file,$dst . '/' . $file);
+                }
+                else {
+                    copy($src . '/' . $file,$dst . '/' . $file);
+                }
+            }
+        }
+        closedir($dir);
+    }
+
     /**
      * Finalize the container
      *
@@ -251,4 +229,4 @@ private function finalizeContainer(InputInterface $input)
 
         return $this;
     }
-}
+}