Skip to content

Commit a4e5058

Browse files
JBlondJBlond
committed
Update Changelog
Increase version number
1 parent 90c5d3d commit a4e5058

20 files changed

+23
-20
lines changed

‎changelog.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# changelog
22

3-
## next
3+
## 2.3.0
44

55
- Add: Change log.
66
- Fix: Html SideBySide renders equal lines of version 1 at both sides (Option ignoreCase).
77
- Fix: Second parameter of string repeat function minimizes to 0.
88
- Fix: #60 - Unified Cli renderer options incompatible with Main renderer options
99
- Fix: #64 - Calculation of maxLineMarkerWidth independent of input format.
10+
- Add: Similarity calculation
11+
- Add: New marking levels for inline differences
12+
- Add: Html merged renderer
1013

1114
## 2.2.1 (2020-08-06)
1215

‎lib/jblond/Diff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Ferry Cools <info@DigiLive.nl>
2929
* @copyright (c) 2020 Mario Brandt
3030
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
31-
* @version 2.2.1
31+
* @version 2.3.0
3232
* @link https://github.com/JBlond/php-diff
3333
*/
3434
class Diff

‎lib/jblond/Diff/DiffUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @package jblond\Diff
1111
* @author Mario Brandt <leet31337@web.de>
1212
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
13-
* @version 2.2.1
13+
* @version 2.3.0
1414
* @link https://github.com/JBlond/php-diff
1515
*/
1616
class DiffUtils

‎lib/jblond/Diff/Renderer/Html/Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @author Ferry Cools <info@DigiLive.nl>
1919
* @copyright (c) 2009 Chris Boulton
2020
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
21-
* @version 2.2.1
21+
* @version 2.3.0
2222
* @link https://github.com/JBlond/php-diff
2323
*/
2424
class Inline extends MainRenderer implements SubRendererInterface

‎lib/jblond/Diff/Renderer/Html/Merged.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author Ferry Cools <info@DigiLive.nl>
1515
* @copyright (c) 2020 Ferry Cools
1616
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
17-
* @version 2.2.1
17+
* @version 2.3.0
1818
* @link https://github.com/JBlond/php-diff
1919
*/
2020
class Merged extends MainRenderer implements SubRendererInterface

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @author Ferry Cools <info@DigiLive.nl>
1919
* @copyright (c) 2009 Chris Boulton
2020
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
21-
* @version 2.2.1
21+
* @version 2.3.0
2222
* @link https://github.com/JBlond/php-diff
2323
*/
2424
class SideBySide extends MainRenderer implements SubRendererInterface

‎lib/jblond/Diff/Renderer/Html/Unified.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @author Ferry Cools <info@DigiLive.nl>
1919
* @copyright (c) 2009 Chris Boulton
2020
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
21-
* @version 2.2.1
21+
* @version 2.3.0
2222
* @link https://github.com/JBlond/php-diff
2323
*/
2424
class Unified extends MainRenderer implements SubRendererInterface

‎lib/jblond/Diff/Renderer/MainRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Ferry Cools <info@DigiLive.nl>
1818
* @copyright (c) 2009 Chris Boulton
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.2.1
20+
* @version 2.3.0
2121
* @link https://github.com/JBlond/php-diff
2222
*/
2323
class MainRenderer extends MainRendererAbstract

‎lib/jblond/Diff/Renderer/MainRendererAbstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @author Ferry Cools <info@DigiLive.nl>
1717
* @copyright (c) 2009 Chris Boulton
1818
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
19-
* @version 2.2.1
19+
* @version 2.3.0
2020
* @link https://github.com/JBlond/php-diff
2121
*/
2222
abstract class MainRendererAbstract

‎lib/jblond/Diff/Renderer/SubRendererInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @author Ferry Cools <info@DigiLive.nl>
1414
* @copyright (c) 2020 Ferry Cools
1515
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
16-
* @version 2.2.1
16+
* @version 2.3.0
1717
* @link https://github.com/JBlond/php-diff
1818
*/
1919
interface SubRendererInterface

‎lib/jblond/Diff/Renderer/Text/Context.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Ferry Cools <info@DigiLive.nl>
1818
* @copyright (c) 2009 Chris Boulton
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.2.1
20+
* @version 2.3.0
2121
* @link https://github.com/JBlond/php-diff
2222
*/
2323
class Context extends MainRendererAbstract

‎lib/jblond/Diff/Renderer/Text/InlineCli.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Ferry Cools <info@DigiLive.nl>
1818
* @copyright (c) 2020 Ferry Cools
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.2.1
20+
* @version 2.3.0
2121
* @link https://github.com/JBlond/php-diff
2222
*/
2323
class InlineCli extends MainRenderer implements SubRendererInterface

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @author Mario Brandt <leet31337@web.de>
1717
* @copyright (c) 2020 Mario Brandt
1818
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
19-
* @version 2.2.1
19+
* @version 2.3.0
2020
* @link https://github.com/JBlond/php-diff
2121
*/
2222

‎lib/jblond/Diff/Renderer/Text/UnifiedCli.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @author Mario Brandt <leet31337@web.de>
1616
* @copyright (c) 2020 Mario Brandt
1717
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
18-
* @version 2.2.1
18+
* @version 2.3.0
1919
* @link https://github.com/JBlond/php-diff
2020
*/
2121

‎lib/jblond/Diff/SequenceMatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Ferry Cools <info@DigiLive.nl>
1818
* @copyright (c) 2020 Mario Brandt
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.2.1
20+
* @version 2.3.0
2121
* @link https://github.com/JBlond/php-diff
2222
*/
2323
class SequenceMatcher

‎lib/jblond/Diff/Similarity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Ferry Cools <info@DigiLive.nl>
1818
* @copyright (c) 2020 Mario Brandt
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.2.1
20+
* @version 2.3.0
2121
* @link https://github.com/JBlond/php-diff
2222
*/
2323
class Similarity extends SequenceMatcher

‎tests/Diff/Renderer/Html/HtmlRenderersTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* @author Ferry Cools <info@DigiLive.nl>
2222
* @copyright (c) 2020 Mario Brandt
2323
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
24-
* @version 2.2.1
24+
* @version 2.3.0
2525
* @link https://github.com/JBlond/php-diff
2626
*/
2727
class HtmlRenderersTest extends TestCase

‎tests/Diff/Renderer/MainRendererTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @author Ferry Cools <info@DigiLive.nl>
2323
* @copyright (c) 2009 Mario Brandt
2424
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
25-
* @version 2.2.1
25+
* @version 2.3.0
2626
* @link https://github.com/JBlond/php-diff
2727
*/
2828

‎tests/Diff/Renderer/Text/TextRenderersTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* @author Ferry Cools <info@DigiLive.nl>
2020
* @copyright (c) 2019 Mario Brandt
2121
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
22-
* @version 2.2.1
22+
* @version 2.3.0
2323
* @link https://github.com/JBlond/php-diff
2424
*/
2525
class TextRenderersTest extends TestCase

‎tests/Diff/SequenceMatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @author Ferry Cools <info@DigiLive.nl>
1616
* @copyright (c) 2009 Mario Brandt
1717
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
18-
* @version 2.2.1
18+
* @version 2.3.0
1919
* @link https://github.com/JBlond/php-diff
2020
*/
2121

0 commit comments

Comments
 (0)