Skip to content

Commit c09edb2

Browse files
authored
Merge pull request #94 from JBlond/release-2.3.2
Bump library version und update Changelog
2 parents 2d0145d + 8a83b39 commit c09edb2

21 files changed

+31
-23
lines changed

changelog.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
# Changelog
22

3-
## 2.3.1 (2021-02-03)
3+
## 2.3.2 (2021-03-27)
4+
5+
* Bump library version ([6e42d96](https://github.com/JBlond/php-diff/commit/6e42d96))
6+
* 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))
7+
* Fix colors ([7eba340](https://github.com/JBlond/php-diff/commit/7eba340))
8+
* Fix repeating class assignment of line header ([fb32453](https://github.com/JBlond/php-diff/commit/fb32453))
9+
* Fix title attribute values ([533a6bf](https://github.com/JBlond/php-diff/commit/533a6bf))
10+
11+
## v2.3.1 (2021-02-03)
412

513
* Add DigiLive/gitChangelog for change log generation ([0a6a84f](https://github.com/JBlond/php-diff/commit/0a6a84f))
614
* Bump library version ([013f862](https://github.com/JBlond/php-diff/commit/013f862))
715
* Cut HTML Unified Renderer ([1ba255f](https://github.com/JBlond/php-diff/commit/1ba255f))
816
* Document PhpUnit Similarity Test ([7ec484c](https://github.com/JBlond/php-diff/commit/7ec484c))
9-
* Document Update Changelog ([7d6c8bb](https://github.com/JBlond/php-diff/commit/7d6c8bb), [c9881d3](https://github.com/JBlond/php-diff/commit/c9881d3))
17+
* Document Update Changelog ([28e1dc0](https://github.com/JBlond/php-diff/commit/28e1dc0), [c9881d3](https://github.com/JBlond/php-diff/commit/c9881d3))
1018
* Document disabled inspection ([909e195](https://github.com/JBlond/php-diff/commit/909e195))
1119
* Document generateLinesEqual() ([8a193c9](https://github.com/JBlond/php-diff/commit/8a193c9))
1220
* Document methods ([94c8bd5](https://github.com/JBlond/php-diff/commit/94c8bd5))

generateChangelog.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
require 'vendor/autoload.php';
66

77
$changelogOptions = [
8-
'headTagName' => '2.3.1',
9-
'headTagDate' => '2021-02-03',
8+
'headTagName' => '2.3.2',
9+
'headTagDate' => '2021-03-27',
1010
'titleOrder' => 'ASC',
1111
];
1212
$changelogLabels = ['Add', 'Cut', 'Fix', 'Bump', 'Document','Optimize'];

lib/jblond/Diff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @author Ferry Cools <[email protected]>
2424
* @copyright (c) 2020 Mario Brandt
2525
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
26-
* @version 2.3.0
26+
* @version 2.3.2
2727
* @link https://github.com/JBlond/php-diff
2828
*/
2929
class Diff

lib/jblond/Diff/DiffUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @author Mario Brandt <[email protected]>
1212
* @copyright (c) 2020 Mario Brandt
1313
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
14-
* @version 2.3.0
14+
* @version 2.3.2
1515
* @link https://github.com/JBlond/php-diff
1616
*/
1717
class DiffUtils

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 <[email protected]>
1515
* @copyright (c) 2020 Ferry Cools
1616
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
17-
* @version 2.3.0
17+
* @version 2.3.2
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 <[email protected]>
1919
* @copyright (c) 2009 Chris Boulton
2020
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
21-
* @version 2.3.0
21+
* @version 2.3.2
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 <[email protected]>
1919
* @copyright (c) 2009 Chris Boulton
2020
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
21-
* @version 2.3.0
21+
* @version 2.3.2
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 <[email protected]>
1818
* @copyright (c) 2009 Chris Boulton
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.3.0
20+
* @version 2.3.2
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 <[email protected]>
1717
* @copyright (c) 2020 Ferry Cools
1818
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
19-
* @version 2.3.0
19+
* @version 2.3.2
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 <[email protected]>
1414
* @copyright (c) 2020 Ferry Cools
1515
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
16-
* @version 2.3.0
16+
* @version 2.3.2
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 <[email protected]>
1818
* @copyright (c) 2009 Chris Boulton
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.3.0
20+
* @version 2.3.2
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 <[email protected]>
1818
* @copyright (c) 2020 Ferry Cools
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.3.0
20+
* @version 2.3.2
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 <[email protected]>
1717
* @copyright (c) 2020 Mario Brandt
1818
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
19-
* @version 2.3.0
19+
* @version 2.3.2
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 <[email protected]>
1616
* @copyright (c) 2020 Mario Brandt
1717
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
18-
* @version 2.3.0
18+
* @version 2.3.2
1919
* @link https://github.com/JBlond/php-diff
2020
*/
2121
class UnifiedCli extends MainRendererAbstract

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 <[email protected]>
1818
* @copyright (c) 2020 Mario Brandt
1919
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
20-
* @version 2.3.0
20+
* @version 2.3.2
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
@@ -16,7 +16,7 @@
1616
* @author Ferry Cools <[email protected]>
1717
* @copyright (c) 2020 Ferry Cools
1818
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
19-
* @version 2.3.0
19+
* @version 2.3.2
2020
* @link https://github.com/JBlond/php-diff
2121
*/
2222
class Similarity extends SequenceMatcher

tests/Diff/Renderer/Html/HtmlRenderersTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* @author Ferry Cools <[email protected]>
2121
* @copyright (c) 2020 Mario Brandt
2222
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
23-
* @version 2.3.0
23+
* @version 2.3.2
2424
* @link https://github.com/JBlond/php-diff
2525
*/
2626
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 <[email protected]>
2323
* @copyright (c) 2009 Mario Brandt
2424
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
25-
* @version 2.3.0
25+
* @version 2.3.2
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 <[email protected]>
2020
* @copyright (c) 2019 Mario Brandt
2121
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
22-
* @version 2.3.0
22+
* @version 2.3.2
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 <[email protected]>
1616
* @copyright (c) 2009 Mario Brandt
1717
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
18-
* @version 2.3.0
18+
* @version 2.3.2
1919
* @link https://github.com/JBlond/php-diff
2020
*/
2121
class SequenceMatcherTest extends TestCase

tests/Diff/SimilarityTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author Ferry Cools <[email protected]>
1515
* @copyright (c) 2020 Ferry Cools
1616
* @license New BSD License http://www.opensource.org/licenses/bsd-license.php
17-
* @version 2.3.0
17+
* @version 2.3.2
1818
* @link https://github.com/JBlond/php-diff
1919
*/
2020
class SimilarityTest extends TestCase

0 commit comments

Comments
 (0)