Merge pull request #94 from JBlond/release-2.3.2

Bump library version und update Changelog
JBlond · Mar 27, 2021 · c09edb2 · c09edb2
2 parents 2d0145d + 8a83b39
commit c09edb2
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 23 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,12 +1,20 @@
 # Changelog
 
-## 2.3.1 (2021-02-03)
+## 2.3.2 (2021-03-27)
+
+* Bump library version ([6e42d96](https://github.com/JBlond/php-diff/commit/6e42d96))
+* Fix [#90](https://github.com/JBlond/php-diff/issues/90) - Merged Diff shows result only partially ([acbfd7d](https://github.com/JBlond/php-diff/commit/acbfd7d))
+* Fix colors ([7eba340](https://github.com/JBlond/php-diff/commit/7eba340))
+* Fix repeating class assignment of line header ([fb32453](https://github.com/JBlond/php-diff/commit/fb32453))
+* Fix title attribute values ([533a6bf](https://github.com/JBlond/php-diff/commit/533a6bf))
+
+## v2.3.1 (2021-02-03)
 
 * Add DigiLive/gitChangelog for change log generation ([0a6a84f](https://github.com/JBlond/php-diff/commit/0a6a84f))
 * Bump library version ([013f862](https://github.com/JBlond/php-diff/commit/013f862))
 * Cut HTML Unified Renderer ([1ba255f](https://github.com/JBlond/php-diff/commit/1ba255f))
 * Document PhpUnit Similarity Test ([7ec484c](https://github.com/JBlond/php-diff/commit/7ec484c))
-* Document Update Changelog ([7d6c8bb](https://github.com/JBlond/php-diff/commit/7d6c8bb), [c9881d3](https://github.com/JBlond/php-diff/commit/c9881d3))
+* Document Update Changelog ([28e1dc0](https://github.com/JBlond/php-diff/commit/28e1dc0), [c9881d3](https://github.com/JBlond/php-diff/commit/c9881d3))
 * Document disabled inspection ([909e195](https://github.com/JBlond/php-diff/commit/909e195))
 * Document generateLinesEqual() ([8a193c9](https://github.com/JBlond/php-diff/commit/8a193c9))
 * Document methods ([94c8bd5](https://github.com/JBlond/php-diff/commit/94c8bd5))

diff --git a/generateChangelog.php b/generateChangelog.php
@@ -5,8 +5,8 @@
 require 'vendor/autoload.php';
 
 $changelogOptions = [
-    'headTagName' => '2.3.1',
-    'headTagDate' => '2021-02-03',
+    'headTagName' => '2.3.2',
+    'headTagDate' => '2021-03-27',
     'titleOrder' => 'ASC',
 ];
 $changelogLabels = ['Add', 'Cut', 'Fix', 'Bump', 'Document','Optimize'];

diff --git a/lib/jblond/Diff.php b/lib/jblond/Diff.php
@@ -23,7 +23,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version         2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class Diff

diff --git a/lib/jblond/Diff/DiffUtils.php b/lib/jblond/Diff/DiffUtils.php
@@ -11,7 +11,7 @@
  * @author          Mario Brandt <leet31337@web.de>
  * @copyright   (c) 2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class DiffUtils

diff --git a/lib/jblond/Diff/Renderer/Html/Merged.php b/lib/jblond/Diff/Renderer/Html/Merged.php
@@ -14,7 +14,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class Merged extends MainRenderer implements SubRendererInterface

diff --git a/lib/jblond/Diff/Renderer/Html/SideBySide.php b/lib/jblond/Diff/Renderer/Html/SideBySide.php
@@ -18,7 +18,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2009 Chris Boulton
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class SideBySide extends MainRenderer implements SubRendererInterface

diff --git a/lib/jblond/Diff/Renderer/Html/Unified.php b/lib/jblond/Diff/Renderer/Html/Unified.php
@@ -18,7 +18,7 @@
  * @author        Ferry Cools <info@DigiLive.nl>
  * @copyright (c) 2009 Chris Boulton
  * @license       New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version       2.3.0
+ * @version      2.3.2
  * @link          https://github.com/JBlond/php-diff
  */
 class Unified extends MainRenderer implements SubRendererInterface

diff --git a/lib/jblond/Diff/Renderer/MainRenderer.php b/lib/jblond/Diff/Renderer/MainRenderer.php
@@ -17,7 +17,7 @@
  * @author        Ferry Cools <info@DigiLive.nl>
  * @copyright (c) 2009 Chris Boulton
  * @license       New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version       2.3.0
+ * @version      2.3.2
  * @link          https://github.com/JBlond/php-diff
  */
 class MainRenderer extends MainRendererAbstract

diff --git a/lib/jblond/Diff/Renderer/MainRendererAbstract.php b/lib/jblond/Diff/Renderer/MainRendererAbstract.php
@@ -16,7 +16,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 abstract class MainRendererAbstract

diff --git a/lib/jblond/Diff/Renderer/SubRendererInterface.php b/lib/jblond/Diff/Renderer/SubRendererInterface.php
@@ -13,7 +13,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 interface SubRendererInterface

diff --git a/lib/jblond/Diff/Renderer/Text/Context.php b/lib/jblond/Diff/Renderer/Text/Context.php
@@ -17,7 +17,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2009 Chris Boulton
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class Context extends MainRendererAbstract

diff --git a/lib/jblond/Diff/Renderer/Text/InlineCli.php b/lib/jblond/Diff/Renderer/Text/InlineCli.php
@@ -17,7 +17,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class InlineCli extends MainRenderer implements SubRendererInterface

diff --git a/lib/jblond/Diff/Renderer/Text/Unified.php b/lib/jblond/Diff/Renderer/Text/Unified.php
@@ -16,7 +16,7 @@
  * @author          Mario Brandt <leet31337@web.de>
  * @copyright   (c) 2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 

diff --git a/lib/jblond/Diff/Renderer/Text/UnifiedCli.php b/lib/jblond/Diff/Renderer/Text/UnifiedCli.php
@@ -15,7 +15,7 @@
  * @author          Mario Brandt <leet31337@web.de>
  * @copyright (c)   2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class UnifiedCli extends MainRendererAbstract

diff --git a/lib/jblond/Diff/SequenceMatcher.php b/lib/jblond/Diff/SequenceMatcher.php
@@ -17,7 +17,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version         2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class SequenceMatcher

diff --git a/lib/jblond/Diff/Similarity.php b/lib/jblond/Diff/Similarity.php
@@ -16,7 +16,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class Similarity extends SequenceMatcher

diff --git a/tests/Diff/Renderer/Html/HtmlRenderersTest.php b/tests/Diff/Renderer/Html/HtmlRenderersTest.php
@@ -20,7 +20,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class HtmlRenderersTest extends TestCase

diff --git a/tests/Diff/Renderer/MainRendererTest.php b/tests/Diff/Renderer/MainRendererTest.php
@@ -22,7 +22,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2009 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 

diff --git a/tests/Diff/Renderer/Text/TextRenderersTest.php b/tests/Diff/Renderer/Text/TextRenderersTest.php
@@ -19,7 +19,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2019 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class TextRenderersTest extends TestCase

diff --git a/tests/Diff/SequenceMatcherTest.php b/tests/Diff/SequenceMatcherTest.php
@@ -15,7 +15,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2009 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class SequenceMatcherTest extends TestCase

diff --git a/tests/Diff/SimilarityTest.php b/tests/Diff/SimilarityTest.php
@@ -14,7 +14,7 @@
  * @author          Ferry Cools <info@DigiLive.nl>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.3.0
+ * @version        2.3.2
  * @link            https://github.com/JBlond/php-diff
  */
 class SimilarityTest extends TestCase