From 8a83b39d2c8b97e4c3d338f693879e2119eeecbe Mon Sep 17 00:00:00 2001 From: JBlond Date: Sat, 27 Mar 2021 14:39:21 +0100 Subject: [PATCH] Bump library version und update Changelog --- changelog.md | 12 ++++++++++-- generateChangelog.php | 4 ++-- lib/jblond/Diff.php | 2 +- lib/jblond/Diff/DiffUtils.php | 2 +- lib/jblond/Diff/Renderer/Html/Merged.php | 2 +- lib/jblond/Diff/Renderer/Html/SideBySide.php | 2 +- lib/jblond/Diff/Renderer/Html/Unified.php | 2 +- lib/jblond/Diff/Renderer/MainRenderer.php | 2 +- lib/jblond/Diff/Renderer/MainRendererAbstract.php | 2 +- lib/jblond/Diff/Renderer/SubRendererInterface.php | 2 +- lib/jblond/Diff/Renderer/Text/Context.php | 2 +- lib/jblond/Diff/Renderer/Text/InlineCli.php | 2 +- lib/jblond/Diff/Renderer/Text/Unified.php | 2 +- lib/jblond/Diff/Renderer/Text/UnifiedCli.php | 2 +- lib/jblond/Diff/SequenceMatcher.php | 2 +- lib/jblond/Diff/Similarity.php | 2 +- tests/Diff/Renderer/Html/HtmlRenderersTest.php | 2 +- tests/Diff/Renderer/MainRendererTest.php | 2 +- tests/Diff/Renderer/Text/TextRenderersTest.php | 2 +- tests/Diff/SequenceMatcherTest.php | 2 +- tests/Diff/SimilarityTest.php | 2 +- 21 files changed, 31 insertions(+), 23 deletions(-) diff --git a/changelog.md b/changelog.md index 503428c..f26dae2 100644 --- 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 index c32f2ce..53af40c 100644 --- 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 index fce45e2..8d06e9a 100644 --- a/lib/jblond/Diff.php +++ b/lib/jblond/Diff.php @@ -23,7 +23,7 @@ * @author Ferry Cools * @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 index 55bacbf..f3e75fb 100644 --- a/lib/jblond/Diff/DiffUtils.php +++ b/lib/jblond/Diff/DiffUtils.php @@ -11,7 +11,7 @@ * @author Mario Brandt * @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 index 3ccfd04..0e5a86c 100644 --- a/lib/jblond/Diff/Renderer/Html/Merged.php +++ b/lib/jblond/Diff/Renderer/Html/Merged.php @@ -14,7 +14,7 @@ * @author Ferry Cools * @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 index 545d4ed..6f84b15 100644 --- a/lib/jblond/Diff/Renderer/Html/SideBySide.php +++ b/lib/jblond/Diff/Renderer/Html/SideBySide.php @@ -18,7 +18,7 @@ * @author Ferry Cools * @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 index b69f6cf..9674bcc 100644 --- a/lib/jblond/Diff/Renderer/Html/Unified.php +++ b/lib/jblond/Diff/Renderer/Html/Unified.php @@ -18,7 +18,7 @@ * @author Ferry Cools * @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 index 7399e0c..4e0af49 100644 --- a/lib/jblond/Diff/Renderer/MainRenderer.php +++ b/lib/jblond/Diff/Renderer/MainRenderer.php @@ -17,7 +17,7 @@ * @author Ferry Cools * @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 index e40bfed..da0623f 100644 --- a/lib/jblond/Diff/Renderer/MainRendererAbstract.php +++ b/lib/jblond/Diff/Renderer/MainRendererAbstract.php @@ -16,7 +16,7 @@ * @author Ferry Cools * @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 index a3ea1bb..1cb7fdc 100644 --- a/lib/jblond/Diff/Renderer/SubRendererInterface.php +++ b/lib/jblond/Diff/Renderer/SubRendererInterface.php @@ -13,7 +13,7 @@ * @author Ferry Cools * @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 index 6fae3bb..5e2da54 100644 --- a/lib/jblond/Diff/Renderer/Text/Context.php +++ b/lib/jblond/Diff/Renderer/Text/Context.php @@ -17,7 +17,7 @@ * @author Ferry Cools * @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 index fb7965c..51f5dd9 100644 --- a/lib/jblond/Diff/Renderer/Text/InlineCli.php +++ b/lib/jblond/Diff/Renderer/Text/InlineCli.php @@ -17,7 +17,7 @@ * @author Ferry Cools * @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 index 40b43a5..3465edd 100644 --- a/lib/jblond/Diff/Renderer/Text/Unified.php +++ b/lib/jblond/Diff/Renderer/Text/Unified.php @@ -16,7 +16,7 @@ * @author Mario Brandt * @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 index e39dc53..750fef9 100644 --- a/lib/jblond/Diff/Renderer/Text/UnifiedCli.php +++ b/lib/jblond/Diff/Renderer/Text/UnifiedCli.php @@ -15,7 +15,7 @@ * @author Mario Brandt * @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 index 1e5fc92..e325f4c 100644 --- a/lib/jblond/Diff/SequenceMatcher.php +++ b/lib/jblond/Diff/SequenceMatcher.php @@ -17,7 +17,7 @@ * @author Ferry Cools * @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 index 0d2ec81..acebbb9 100644 --- a/lib/jblond/Diff/Similarity.php +++ b/lib/jblond/Diff/Similarity.php @@ -16,7 +16,7 @@ * @author Ferry Cools * @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 index 1063952..6983056 100644 --- a/tests/Diff/Renderer/Html/HtmlRenderersTest.php +++ b/tests/Diff/Renderer/Html/HtmlRenderersTest.php @@ -20,7 +20,7 @@ * @author Ferry Cools * @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 index 9dbc3a0..4780419 100644 --- a/tests/Diff/Renderer/MainRendererTest.php +++ b/tests/Diff/Renderer/MainRendererTest.php @@ -22,7 +22,7 @@ * @author Ferry Cools * @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 index 6c852ca..b506bb8 100644 --- a/tests/Diff/Renderer/Text/TextRenderersTest.php +++ b/tests/Diff/Renderer/Text/TextRenderersTest.php @@ -19,7 +19,7 @@ * @author Ferry Cools * @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 index 0d85127..0517609 100644 --- a/tests/Diff/SequenceMatcherTest.php +++ b/tests/Diff/SequenceMatcherTest.php @@ -15,7 +15,7 @@ * @author Ferry Cools * @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 index b9bdbb9..3171ae6 100644 --- a/tests/Diff/SimilarityTest.php +++ b/tests/Diff/SimilarityTest.php @@ -14,7 +14,7 @@ * @author Ferry Cools * @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