Skip to content

Commit 87a9594

Browse files
Start development of next major version
1 parent 689a62c commit 87a9594

File tree

5 files changed

+25
-18
lines changed

5 files changed

+25
-18
lines changed

.github/workflows/ci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
contents: read
1111

1212
env:
13-
COMPOSER_ROOT_VERSION: "6.0.x-dev"
13+
COMPOSER_ROOT_VERSION: "7.0.x-dev"
1414

1515
jobs:
1616
coding-guidelines:
@@ -61,7 +61,6 @@ jobs:
6161
fail-fast: false
6262
matrix:
6363
php-version:
64-
- "8.2"
6564
- "8.3"
6665
- "8.4"
6766
- "8.5"

ChangeLog.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
44

5+
## [7.0.0] - 2025-02-07
6+
7+
### Removed
8+
9+
* This component is no longer supported on PHP 8.3
10+
511
## [6.0.2] - 2024-07-03
612

713
### Changed
@@ -21,7 +27,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
2127
* `SebastianBergmann\Diff\Chunk::getStart()`, `SebastianBergmann\Diff\Chunk::getStartRange()`, `SebastianBergmann\Diff\Chunk::getEnd()`, `SebastianBergmann\Diff\Chunk::getEndRange()`, and `SebastianBergmann\Diff\Chunk::getLines()`
2228
* `SebastianBergmann\Diff\Diff::getFrom()`, `SebastianBergmann\Diff\Diff::getTo()`, and `SebastianBergmann\Diff\Diff::getChunks()`
2329
* `SebastianBergmann\Diff\Line::getContent()` and `SebastianBergmann\Diff\Diff::getType()`
24-
* Removed support for PHP 8.1
30+
* This component is no longer supported on PHP 8.1
2531

2632
## [5.1.1] - 2024-03-02
2733

@@ -75,7 +81,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
7581

7682
### Removed
7783

78-
* Removed support for PHP 7.3, PHP 7.4, and PHP 8.0
84+
* This component is no longer supported on PHP 7.3, PHP 7.4, and PHP 8.0
7985

8086
## [4.0.4] - 2020-10-26
8187

@@ -105,7 +111,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
105111

106112
### Removed
107113

108-
* Removed support for PHP 7.1 and PHP 7.2
114+
* This component is no longer supported on PHP 7.1 and PHP 7.2
109115

110116
## [3.0.2] - 2019-02-04
111117

@@ -129,7 +135,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
129135

130136
### Removed
131137

132-
* Removed support for PHP 7.0
138+
* This component is no longer supported on PHP 7.0
133139

134140
### Fixed
135141

@@ -151,6 +157,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
151157

152158
* This component is no longer supported on PHP 5.6
153159

160+
[7.0.0]: https://github.com/sebastianbergmann/diff/compare/6.0...main
154161
[6.0.2]: https://github.com/sebastianbergmann/diff/compare/6.0.1...6.0.2
155162
[6.0.1]: https://github.com/sebastianbergmann/diff/compare/6.0.0...6.0.1
156163
[6.0.0]: https://github.com/sebastianbergmann/diff/compare/5.1...6.0.0

composer.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818
"issues": "https://github.com/sebastianbergmann/diff/issues",
1919
"security": "https://github.com/sebastianbergmann/diff/security/policy"
2020
},
21+
"minimum-stability": "dev",
2122
"prefer-stable": true,
2223
"config": {
2324
"platform": {
24-
"php": "8.2.0"
25+
"php": "8.3.0"
2526
},
2627
"optimize-autoloader": true,
2728
"sort-packages": true
2829
},
2930
"require": {
30-
"php": ">=8.2"
31+
"php": ">=8.3"
3132
},
3233
"require-dev": {
33-
"phpunit/phpunit": "^11.3",
34+
"phpunit/phpunit": "^12.0-dev",
3435
"symfony/process": "^4.2 || ^5"
3536
},
3637
"autoload": {
@@ -45,7 +46,7 @@
4546
},
4647
"extra": {
4748
"branch-alias": {
48-
"dev-main": "6.0-dev"
49+
"dev-main": "7.0-dev"
4950
}
5051
}
5152
}

src/Differ.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030

3131
final class Differ
3232
{
33-
public const OLD = 0;
34-
public const ADDED = 1;
35-
public const REMOVED = 2;
36-
public const DIFF_LINE_END_WARNING = 3;
37-
public const NO_LINE_END_EOF_WARNING = 4;
33+
public const int OLD = 0;
34+
public const int ADDED = 1;
35+
public const int REMOVED = 2;
36+
public const int DIFF_LINE_END_WARNING = 3;
37+
public const int NO_LINE_END_EOF_WARNING = 4;
3838
private DiffOutputBuilderInterface $outputBuilder;
3939

4040
public function __construct(DiffOutputBuilderInterface $outputBuilder)

src/Line.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
final class Line
1313
{
14-
public const ADDED = 1;
15-
public const REMOVED = 2;
16-
public const UNCHANGED = 3;
14+
public const int ADDED = 1;
15+
public const int REMOVED = 2;
16+
public const int UNCHANGED = 3;
1717
private int $type;
1818
private string $content;
1919

0 commit comments

Comments
 (0)