Merge branch 'development' into DigiLive

# Conflicts:
#	lib/jblond/Diff.php
#	lib/jblond/Diff/Renderer/Text/Unified.php

Author: DigiLive

.gitignore

@@ -11,12 +11,10 @@ composer.phar
 # composer.lock
 
 ### Eclipse ###
-.metadata
 bin/
 tmp/
 *.tmp
 *.bak
-*.swp
 *~.nib
 local.properties
 .settings/
@@ -29,14 +27,6 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
 
 # Java annotation processor (APT)
 .factorypath
@@ -79,31 +69,7 @@ local.properties
 
 .sts4-cache/
 
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
 
-# Windows shortcuts
-*.lnk
 
 # End of https://www.gitignore.io/api/windows,eclipse,composer
 /composer.lock

lib/jblond/Diff.php

@@ -5,6 +5,11 @@
 namespace jblond;
 
 use InvalidArgumentException;
+use jblond\Diff\Renderer\Html\Inline;
+use jblond\Diff\Renderer\Html\SideBySide;
+use jblond\Diff\Renderer\Html\Unified as UnifiedHtml;
+use jblond\Diff\Renderer\Text\Context;
+use jblond\Diff\Renderer\Text\Unified;
 use jblond\Diff\SequenceMatcher;
 use OutOfRangeException;
 
@@ -158,7 +163,8 @@ public function getVersion2(): array
     /**
      * Render a diff-view using a rendering class and get its results.
      *
-     * @param object $renderer An instance of the rendering object, used for generating the diff-view.
+     * @param object|Context|Unified|UnifiedHtml|Inline|SideBySide $renderer An instance of the rendering object,
+     * used for generating the diff-view.
      *
      * @return mixed The generated diff-view. The type of the return value depends on the applied rendereder.
      */

lib/jblond/Diff/Renderer/Html/HtmlArray.php

@@ -45,7 +45,7 @@ class HtmlArray extends RendererAbstract
      * This method is called by the renderers which extends this class.
      *
      * @param array  $changes      Contains the op-codes about the differences between "old and "new".
-     * @param object $htmlRenderer Renderer which extends this class.
+     * @param object|Inline|SideBySide|Unified $htmlRenderer Renderer which extends this class.
      *
      * @return string HTML representation of the differences.
      */

lib/jblond/Diff/Renderer/Html/SideBySide.php

@@ -166,7 +166,7 @@ public function generateTableRowsReplace(array $changes): string
     {
         $html = '';
 
-        //TODO: Is below comparison result ever false?
+        // Is below comparison result ever false?
         if (count($changes['base']['lines']) >= count($changes['changed']['lines'])) {
             foreach ($changes['base']['lines'] as $lineNo => $line) {
                 $fromLine    = $changes['base']['offset'] + $lineNo + 1;

lib/jblond/Diff/Renderer/Text/Unified.php

@@ -53,22 +53,21 @@ public function render(): string
                             "\n ",
                             $this->diff->getArrayRange($this->diff->getVersion1(), $i1, $i2)
                         ) . "\n";
-                } else {
-                    if ($tag == 'replace' || $tag == 'delete') {
-                        $diff .= '-' .
-                            implode(
-                                "\n-",
-                                $this->diff->getArrayRange($this->diff->getVersion1(), $i1, $i2)
-                            ) . "\n";
-                    }
-
-                    if ($tag == 'replace' || $tag == 'insert') {
-                        $diff .= '+' .
-                            implode(
-                                "\n+",
-                                $this->diff->getArrayRange($this->diff->getVersion2(), $j1, $j2)
-                            ) . "\n";
-                    }
+                    continue;
+                }
+                if ($tag == 'replace' || $tag == 'delete') {
+                    $diff .= '-' .
+                        implode(
+                            "\n-",
+                            $this->diff->getArrayRange($this->diff->getVersion1(), $i1, $i2)
+                        ) . "\n";
+                }
+                if ($tag == 'replace' || $tag == 'insert') {
+                    $diff .= '+' .
+                        implode(
+                            "\n+",
+                            $this->diff->getArrayRange($this->diff->getVersion2(), $j1, $j2)
+                        ) . "\n";
                 }
             }
         }