Use userspace differ

moffe42 · Jul 31, 2015 · bd48763 · bd48763
1 parent d6ee9bf
commit bd48763
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,8 @@
         "symfony/console": "^2.7",
         "psr/log": "^1.0",
         "sebastian/version": "^1.0",
-        "phpunit/php-timer": "^1.0"
+        "phpunit/php-timer": "^1.0",
+        "sebastian/diff": "^1.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.7"

diff --git a/src/DBDiffer/CLI/DBDCommand.php b/src/DBDiffer/CLI/DBDCommand.php
@@ -7,6 +7,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
+use SebastianBergmann\Diff\Differ;
 
 class DBDCommand extends Command
 {
@@ -46,6 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $remoteDbTableFetcher = new \jach\DBDiffer\SQLTableFetcher\DatabaseSQLTableFetcher($dbRemote);
 
         $sqlDiffer = new \jach\DBDiffer\SQLDiffer();
+        $differ = new Differ("--- File\n+++ Database\n", false);
 
         $errors = [];
         foreach ($dir as $fileinfo) {
@@ -89,15 +91,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $res1 = trim($res1);
                 $res2 = trim($res2);
 
+                $sqlDiff = $differ->diff($res1, $res2);
                 if (!$sqlDiffer->diff($res1, $res2)) {
                     $errors[] = "{$tableName} is not equal";
-                    $tmpName1 = tempnam("/tmp", "FOO");
-                    $tmpName2 = tempnam("/tmp", "FOO");
-                    file_put_contents($tmpName1, $res1);
-                    file_put_contents($tmpName2, $res2);
-                    $errors[] = shell_exec("diff -u {$tmpName1} {$tmpName2}");
-                    unlink($tmpName1);
-                    unlink($tmpName2);
+                    $errors[] = $sqlDiff;
                 }
                 $progress->advance();
             }