From e88dffb09116f41ac2047303951fdd9ffccf7107 Mon Sep 17 00:00:00 2001 From: JBlond Date: Tue, 26 Oct 2021 20:08:46 +0200 Subject: [PATCH] Bump library version und update Changelog --- changelog.md | 20 +++++++++++++++++-- generateChangelog.php | 2 +- 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 +- .../Diff/Renderer/MainRendererAbstract.php | 2 +- .../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 +- .../Diff/Renderer/Html/HtmlRenderersTest.php | 2 +- tests/Diff/Renderer/MainRendererTest.php | 2 +- .../Diff/Renderer/Text/TextRenderersTest.php | 2 +- tests/Diff/SequenceMatcherTest.php | 2 +- tests/Diff/SimilarityTest.php | 2 +- 21 files changed, 38 insertions(+), 22 deletions(-) diff --git a/changelog.md b/changelog.md index f1efde8..7a16af5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,23 @@ # Changelog -## 2.3.3 (2021-08-23) - +## 2.4.0 (2021-08-23) + +* Add deprecation notice for missing method ([f494b3a](https://github.com/JBlond/php-diff/commit/f494b3a), [9403eba](https://github.com/JBlond/php-diff/commit/9403eba)) +* Add generator for ignored lines ([6b8662e](https://github.com/JBlond/php-diff/commit/6b8662e), [4dec4ad](https://github.com/JBlond/php-diff/commit/4dec4ad)) +* Add method `generateLinesIgnore` ([6ef61bc](https://github.com/JBlond/php-diff/commit/6ef61bc), [75f5ce0](https://github.com/JBlond/php-diff/commit/75f5ce0)) +* Bump library version und update Changelog ([a5c49d1](https://github.com/JBlond/php-diff/commit/a5c49d1)) +* Document methods ([9699b5b](https://github.com/JBlond/php-diff/commit/9699b5b), [7d973d3](https://github.com/JBlond/php-diff/commit/7d973d3)) +* Document option `ignoreLines` ([0849a1e](https://github.com/JBlond/php-diff/commit/0849a1e), [19634bb](https://github.com/JBlond/php-diff/commit/19634bb)) +* Document update grammar in the comments ([3f44195](https://github.com/JBlond/php-diff/commit/3f44195)) +* Fix PSR-12 code style ([0bf1a08](https://github.com/JBlond/php-diff/commit/0bf1a08)) +* Optimize Sequence renderer ([576830c](https://github.com/JBlond/php-diff/commit/576830c), [bb0eed4](https://github.com/JBlond/php-diff/commit/bb0eed4)) +* Optimize colorize is only used here ([02cf114](https://github.com/JBlond/php-diff/commit/02cf114)) +* Optimize constant usage ([d0cede3](https://github.com/JBlond/php-diff/commit/d0cede3), [3591515](https://github.com/JBlond/php-diff/commit/3591515)) +* Optimize stripping empty/blank lines ([ea6a2e4](https://github.com/JBlond/php-diff/commit/ea6a2e4), [a239f17](https://github.com/JBlond/php-diff/commit/a239f17)) + +## v2.3.3 (2021-08-23) + +* Bump library version und update Changelog ([f5ce6bc](https://github.com/JBlond/php-diff/commit/f5ce6bc)) * Fix Autoload test classes only in development ([31b4222](https://github.com/JBlond/php-diff/commit/31b4222)) ## v2.3.2 (2021-03-27) diff --git a/generateChangelog.php b/generateChangelog.php index c023e16..ceab516 100644 --- a/generateChangelog.php +++ b/generateChangelog.php @@ -5,7 +5,7 @@ require 'vendor/autoload.php'; $changelogOptions = [ - 'headTagName' => '2.3.3', + 'headTagName' => '2.4.0', 'headTagDate' => '2021-08-23', 'titleOrder' => 'ASC', ]; diff --git a/lib/jblond/Diff.php b/lib/jblond/Diff.php index 4038056..86c4350 100644 --- a/lib/jblond/Diff.php +++ b/lib/jblond/Diff.php @@ -24,7 +24,7 @@ * @author Ferry Cools * @copyright (c) 2020 Mario Brandt * @license New BSD License http://www.opensource.org/licenses/bsd-license.php - * @version 2.3.3 + * @version 2.4.0 * @link https://github.com/JBlond/php-diff */ class Diff implements ConstantsInterface diff --git a/lib/jblond/Diff/DiffUtils.php b/lib/jblond/Diff/DiffUtils.php index 29553e0..0dee1f0 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.3 + * @version 2.4.0 * @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 6883378..5b20e81 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.3 + * @version 2.4.0 * @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 db7ccf7..9fddd54 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.3 + * @version 2.4.0 * @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 1f9faf3..df1b3cf 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.3 + * @version 2.4.0 * @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 21e9a97..4ee80d4 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.3 + * @version 2.4.0 * @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 5975963..4cedfcb 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.3 + * @version 2.4.0 * @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 8feffbe..cc12ead 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.3 + * @version 2.4.0 * @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 30b11c4..c952359 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.3 + * @version 2.4.0 * @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 25cf07f..d516737 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.3 + * @version 2.4.0 * @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 86291f0..da8fc18 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.3 + * @version 2.4.0 * @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 50b11d3..96c6795 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.3 + * @version 2.4.0 * @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 5c7859e..73ce32c 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.3 + * @version 2.4.0 * @link https://github.com/JBlond/php-diff */ class SequenceMatcher implements ConstantsInterface diff --git a/lib/jblond/Diff/Similarity.php b/lib/jblond/Diff/Similarity.php index fc9c961..1b8a307 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.3 + * @version 2.4.0 * @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 a32dcd9..3054e6d 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.3 + * @version 2.4.0 * @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 500aa68..67719d9 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.3 + * @version 2.4.0 * @link https://github.com/JBlond/php-diff */ diff --git a/tests/Diff/Renderer/Text/TextRenderersTest.php b/tests/Diff/Renderer/Text/TextRenderersTest.php index 8eeeaf3..016c607 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.3 + * @version 2.4.0 * @link https://github.com/JBlond/php-diff */ class TextRenderersTest extends TestCase diff --git a/tests/Diff/SequenceMatcherTest.php b/tests/Diff/SequenceMatcherTest.php index af8f200..3900a14 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.3 + * @version 2.4.0 * @link https://github.com/JBlond/php-diff */ class SequenceMatcherTest extends TestCase diff --git a/tests/Diff/SimilarityTest.php b/tests/Diff/SimilarityTest.php index fc51ae5..410a6fe 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.3 + * @version 2.4.0 * @link https://github.com/JBlond/php-diff */ class SimilarityTest extends TestCase