Merge pull request #6 from caxy/feature-insert_space_in_replace

Configuration option for inserting space in replace

Author: mgersten-caxy

DependencyInjection/Configuration.php

@@ -30,6 +30,9 @@ public function getConfigTreeBuilder()
                     ->prototype('scalar')->end()
                 ->end()
                 ->booleanNode('group_diffs')->end()
+                ->booleanNode('insert_space_in_replace')
+                    ->defaultFalse()
+                ->end()
             ->end();
 
         return $treeBuilder;

Service/HtmlDiffService.php

@@ -11,6 +11,7 @@ class HtmlDiffService
     const PARAMETER_SPECIAL_CASE_CHARS = 'special_case_chars';
     const PARAMETER_ENCODING = 'encoding';
     const PARAMETER_GROUP_DIFFS = 'group_diffs';
+    const PARAMETER_INSERT_SPACE_IN_REPLACE = 'insert_space_in_replace';
 
     protected $container;
 
@@ -20,6 +21,8 @@ class HtmlDiffService
 
     protected $groupDiffs;
 
+    protected $insertSpaceInReplace;
+
     protected $encoding = 'UTF-8';
 
     public function __construct(ContainerInterface $container)
@@ -34,6 +37,7 @@ public function __construct(ContainerInterface $container)
         $this->loadParameter(self::PARAMETER_SPECIAL_CASE_TAGS, $this->specialCaseTags);
         $this->loadParameter(self::PARAMETER_SPECIAL_CASE_CHARS, $this->specialCaseChars);
         $this->loadParameter(self::PARAMETER_GROUP_DIFFS, $this->groupDiffs);
+        $this->loadParameter(self::PARAMETER_INSERT_SPACE_IN_REPLACE, $this->insertSpaceInReplace);
     }
 
     public function loadParameter($param, &$property)
@@ -60,6 +64,10 @@ public function diff($oldText, $newText, $groupDiffs = null, $specialCaseChars =
             $diff->setSpecialCaseChars($specialCaseChars);
         }
 
+        if ($this->insertSpaceInReplace !== null) {
+            $diff->setInsertSpaceInReplace($this->insertSpaceInReplace);
+        }
+
         return $diff->build();
     }
 

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/framework-bundle": "~2.1",
-        "caxy/php-htmldiff": ">=0.0.1"
+        "caxy/php-htmldiff": ">=0.0.3"
     },
     "target-dir": "Caxy/HtmlDiffBundle",
     "autoload": {