Merge pull request #61 from JBlond/php-dif-60

Php diff 60
JBlond · Oct 8, 2020 · 3940323 · 3940323
2 parents 1a71822 + 8098c71
commit 3940323
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/example/cli.php b/example/cli.php
@@ -44,7 +44,7 @@
 $renderer = new UnifiedCli(
 // Define renderer options.
     [
-        'cliColor' => 'simple',
+        'cliColor' => true,
     ]
 );
 

diff --git a/lib/jblond/Diff/Renderer/Html/Inline.php b/lib/jblond/Diff/Renderer/Html/Inline.php
@@ -49,8 +49,7 @@ class Inline extends MainRenderer implements SubRendererInterface
      */
     public function __construct(array $options = [])
     {
-        parent::__construct();
-        $this->setOptions($this->subOptions);
+        parent::__construct($this->subOptions);
         $this->setOptions($options);
     }
 

diff --git a/lib/jblond/Diff/Renderer/Html/SideBySide.php b/lib/jblond/Diff/Renderer/Html/SideBySide.php
@@ -49,8 +49,7 @@ class SideBySide extends MainRenderer implements SubRendererInterface
      */
     public function __construct(array $options = [])
     {
-        parent::__construct();
-        $this->setOptions($this->subOptions);
+        parent::__construct($this->subOptions);
         $this->setOptions($options);
     }
 

diff --git a/lib/jblond/Diff/Renderer/Html/Unified.php b/lib/jblond/Diff/Renderer/Html/Unified.php
@@ -49,8 +49,7 @@ class Unified extends MainRenderer implements SubRendererInterface
      */
     public function __construct(array $options = [])
     {
-        parent::__construct();
-        $this->setOptions($this->subOptions);
+        parent::__construct($this->subOptions);
         $this->setOptions($options);
     }
 

diff --git a/lib/jblond/Diff/Renderer/MainRendererAbstract.php b/lib/jblond/Diff/Renderer/MainRendererAbstract.php
@@ -36,8 +36,8 @@ abstract class MainRendererAbstract
      *              - deleteMarkers     Markers for removed text.
      *              - insertMarkers     Markers for inserted text.
      *              - equalityMarkers   Markers for unchanged and changed lines.
-     *              - insertColors      Fore- and background color for inserted text. Only when cloColor = true.
-     *              - deleteColors      Fore- and background color for removed text. Only when cloColor = true.
+     *              - insertColors      Fore- and background color for inserted text. Only when cliColor = true.
+     *              - deleteColors      Fore- and background color for removed text. Only when cliColor = true.
      */
     protected $mainOptions = [
         'tabSize'         => 4,

diff --git a/lib/jblond/Diff/Renderer/Text/InlineCli.php b/lib/jblond/Diff/Renderer/Text/InlineCli.php
@@ -37,8 +37,7 @@ class InlineCli extends MainRenderer implements SubRendererInterface
      */
     public function __construct(array $options = [])
     {
-        parent::__construct();
-        $this->setOptions($this->subOptions);
+        parent::__construct($this->subOptions);
         $this->setOptions($options);
     }
 

diff --git a/lib/jblond/Diff/Renderer/Text/UnifiedCli.php b/lib/jblond/Diff/Renderer/Text/UnifiedCli.php
@@ -27,15 +27,23 @@ class UnifiedCli extends MainRendererAbstract
      */
     private $colors;
 
+    /**
+     * @var array   Associative array containing the default options available for this renderer and their default
+     *              value.
+     */
+    protected $subOptions = [];
+
     /**
      * UnifiedCli constructor.
      * @param array $options
+     *
      */
     public function __construct(array $options = [])
     {
-        parent::__construct($options);
+        parent::__construct();
+        $this->setOptions($this->subOptions);
+        $this->setOptions($options);
         $this->colors = new CliColors();
-        $this->options = $options;
     }
 
     /**
@@ -46,13 +54,7 @@ public function __construct(array $options = [])
      */
     public function render(): string
     {
-        if (!isset($this->options['cliColor'])) {
-            return $this->output();
-        }
-        if (isset($this->options['cliColor']) && $this->options['cliColor'] == 'simple') {
-            return $this->output();
-        }
-        throw new InvalidArgumentException('Invalid cliColor option');
+        return $this->output();
     }
 
 
@@ -63,7 +65,7 @@ public function render(): string
      */
     private function colorizeString($string, $color = ''): string
     {
-        if (isset($this->options['cliColor']) && $this->options['cliColor'] == 'simple') {
+        if ($this->options['cliColor']) {
             return $this->colors->getColoredString($string, $color);
         }
         return $string;