Start development of next major version

Author: sebastianbergmann

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 env:
-  COMPOSER_ROOT_VERSION: "6.0.x-dev"
+  COMPOSER_ROOT_VERSION: "7.0.x-dev"
 
 jobs:
   coding-guidelines:
@@ -61,7 +61,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.2"
           - "8.3"
           - "8.4"
           - "8.5"

ChangeLog.md

@@ -2,6 +2,12 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [7.0.0] - 2025-02-07
+
+### Removed
+
+* This component is no longer supported on PHP 8.3
+
 ## [6.0.2] - 2024-07-03
 
 ### Changed
@@ -21,7 +27,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 * `SebastianBergmann\Diff\Chunk::getStart()`, `SebastianBergmann\Diff\Chunk::getStartRange()`, `SebastianBergmann\Diff\Chunk::getEnd()`, `SebastianBergmann\Diff\Chunk::getEndRange()`, and `SebastianBergmann\Diff\Chunk::getLines()`
 * `SebastianBergmann\Diff\Diff::getFrom()`, `SebastianBergmann\Diff\Diff::getTo()`, and `SebastianBergmann\Diff\Diff::getChunks()`
 * `SebastianBergmann\Diff\Line::getContent()` and `SebastianBergmann\Diff\Diff::getType()`
-* Removed support for PHP 8.1
+* This component is no longer supported on PHP 8.1
 
 ## [5.1.1] - 2024-03-02
 
@@ -75,7 +81,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 ### Removed
 
-* Removed support for PHP 7.3, PHP 7.4, and PHP 8.0
+* This component is no longer supported on PHP 7.3, PHP 7.4, and PHP 8.0
 
 ## [4.0.4] - 2020-10-26
 
@@ -105,7 +111,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 ### Removed
 
-* Removed support for PHP 7.1 and PHP 7.2
+* This component is no longer supported on PHP 7.1 and PHP 7.2
 
 ## [3.0.2] - 2019-02-04
 
@@ -129,7 +135,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 ### Removed
 
-* Removed support for PHP 7.0
+* This component is no longer supported on PHP 7.0
 
 ### Fixed
 
@@ -151,6 +157,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 * This component is no longer supported on PHP 5.6
 
+[7.0.0]: https://github.com/sebastianbergmann/diff/compare/6.0...main
 [6.0.2]: https://github.com/sebastianbergmann/diff/compare/6.0.1...6.0.2
 [6.0.1]: https://github.com/sebastianbergmann/diff/compare/6.0.0...6.0.1
 [6.0.0]: https://github.com/sebastianbergmann/diff/compare/5.1...6.0.0

composer.json

@@ -18,19 +18,20 @@
         "issues": "https://github.com/sebastianbergmann/diff/issues",
         "security": "https://github.com/sebastianbergmann/diff/security/policy"
     },
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "platform": {
-            "php": "8.2.0"
+            "php": "8.3.0"
         },
         "optimize-autoloader": true,
         "sort-packages": true
     },
     "require": {
-        "php": ">=8.2"
+        "php": ">=8.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^11.3",
+        "phpunit/phpunit": "^12.0-dev",
         "symfony/process": "^4.2 || ^5"
     },
     "autoload": {
@@ -45,7 +46,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "6.0-dev"
+            "dev-main": "7.0-dev"
         }
     }
 }

src/Differ.php

@@ -30,11 +30,11 @@
 
 final class Differ
 {
-    public const OLD                     = 0;
-    public const ADDED                   = 1;
-    public const REMOVED                 = 2;
-    public const DIFF_LINE_END_WARNING   = 3;
-    public const NO_LINE_END_EOF_WARNING = 4;
+    public const int OLD                     = 0;
+    public const int ADDED                   = 1;
+    public const int REMOVED                 = 2;
+    public const int DIFF_LINE_END_WARNING   = 3;
+    public const int NO_LINE_END_EOF_WARNING = 4;
     private DiffOutputBuilderInterface $outputBuilder;
 
     public function __construct(DiffOutputBuilderInterface $outputBuilder)

src/Line.php

@@ -11,9 +11,9 @@
 
 final class Line
 {
-    public const ADDED     = 1;
-    public const REMOVED   = 2;
-    public const UNCHANGED = 3;
+    public const int ADDED     = 1;
+    public const int REMOVED   = 2;
+    public const int UNCHANGED = 3;
     private int $type;
     private string $content;