Update Changelog

Increase version number
JBlond · Nov 19, 2020 · a4e5058 · a4e5058
1 parent 90c5d3d
commit a4e5058
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 20 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,12 +1,15 @@
 # changelog
 
-## next
+## 2.3.0
 
 - Add: Change log.
 - Fix: Html SideBySide renders equal lines of version 1 at both sides (Option ignoreCase).
 - Fix: Second parameter of string repeat function minimizes to 0.
 - Fix: #60 - Unified Cli renderer options incompatible with Main renderer options
 - Fix: #64 - Calculation of maxLineMarkerWidth independent of input format.
+- Add: Similarity calculation
+- Add: New marking levels for inline differences
+- Add: Html merged renderer
 
 ## 2.2.1 (2020-08-06)
 

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

diff --git a/lib/jblond/Diff/DiffUtils.php b/lib/jblond/Diff/DiffUtils.php
@@ -10,7 +10,7 @@
  * @package     jblond\Diff
  * @author      Mario Brandt <[email protected]>
  * @license     New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version     2.2.1
+ * @version     2.3.0
  * @link        https://github.com/JBlond/php-diff
  */
 class DiffUtils

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

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 <[email protected]>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.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
@@ -18,7 +18,7 @@
  * @author          Ferry Cools <[email protected]>
  * @copyright   (c) 2009 Chris Boulton
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.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
@@ -18,7 +18,7 @@
  * @author          Ferry Cools <[email protected]>
  * @copyright   (c) 2009 Chris Boulton
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.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
@@ -17,7 +17,7 @@
  * @author        Ferry Cools <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license       New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version       2.2.1
+ * @version       2.3.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
@@ -16,7 +16,7 @@
  * @author          Ferry Cools <[email protected]>
  * @copyright   (c) 2009 Chris Boulton
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.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
@@ -13,7 +13,7 @@
  * @author      Ferry Cools <[email protected]>
  * @copyright   (c) 2020 Ferry Cools
  * @license     New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version     2.2.1
+ * @version     2.3.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
@@ -17,7 +17,7 @@
  * @author      Ferry Cools <[email protected]>
  * @copyright   (c) 2009 Chris Boulton
  * @license     New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version     2.2.1
+ * @version     2.3.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
@@ -17,7 +17,7 @@
  * @author          Ferry Cools <[email protected]>
  * @copyright   (c) 2020 Ferry Cools
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.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
@@ -16,7 +16,7 @@
  * @author      Mario Brandt <[email protected]>
  * @copyright   (c) 2020 Mario Brandt
  * @license     New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version     2.2.1
+ * @version     2.3.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
@@ -15,7 +15,7 @@
  * @author          Mario Brandt <[email protected]>
  * @copyright (c)   2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.0
  * @link            https://github.com/JBlond/php-diff
  */
 

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

diff --git a/lib/jblond/Diff/Similarity.php b/lib/jblond/Diff/Similarity.php
@@ -17,7 +17,7 @@
  * @author          Ferry Cools <[email protected]>
  * @copyright   (c) 2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.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
@@ -21,7 +21,7 @@
  * @author          Ferry Cools <[email protected]>
  * @copyright   (c) 2020 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.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
@@ -22,7 +22,7 @@
  * @author          Ferry Cools <[email protected]>
  * @copyright   (c) 2009 Mario Brandt
  * @license         New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version         2.2.1
+ * @version         2.3.0
  * @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 <[email protected]>
  * @copyright   (c) 2019 Mario Brandt
  * @license     New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version     2.2.1
+ * @version     2.3.0
  * @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 <[email protected]>
  * @copyright   (c) 2009 Mario Brandt
  * @license     New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version     2.2.1
+ * @version     2.3.0
  * @link        https://github.com/JBlond/php-diff
  */