Merge pull request #207 from localheinz/fix/diff

Fix: Use localheinz/diff instead of sebastian/diff

.dependabot/config.yml

@@ -17,10 +17,6 @@ update_configs:
           dependency_name: "localheinz/composer-json-normalizer"
       - match:
           dependency_name: "localheinz/json-normalizer"
-      - match:
-          dependency_name: "phpunit/phpunit"
-      - match:
-          dependency_name: "sebastian/diff"
     package_manager: "php:composer"
     update_schedule: "live"
     version_requirement_updates: "increase_versions"

CHANGELOG.md

@@ -9,9 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Unreleased
 
-For a full diff see [`1.3.0...1.x`](https://github.com/localheinz/composer-normalize/compare/1.3.0...1.x).
+For a full diff see [`1.3.1...1.x`](https://github.com/localheinz/composer-normalize/compare/1.3.1...1.x).
 
-## `1.3.0`
+## [`1.3.1`](https://github.com/localheinz/composer-normalize/releases/tag/1.3.1)
+
+#### Fixed
+
+* Started using `localheinz/diff` to avoid issues using `sebastian/diff` ([#207](https://github.com/localheinz/composer-normalize/pull/207)), by [@localheinz](https://github.com/localheinz)
+
+## [`1.3.0`](https://github.com/localheinz/composer-normalize/releases/tag/1.3.0)
+
+For a full diff see [`1.2.0...1.3.0`](https://github.com/localheinz/composer-normalize/compare/1.2.0...1.3.0).
 
 #### Changed
 

composer.json

@@ -20,8 +20,8 @@
     "php": "^7.1",
     "composer-plugin-api": "^1.1.0",
     "localheinz/composer-json-normalizer": "^1.0.2",
-    "localheinz/json-normalizer": "~0.9.0",
-    "sebastian/diff": "^2.0.1 || ^3.0.0"
+    "localheinz/diff": "^1.0.0",
+    "localheinz/json-normalizer": "~0.9.0"
   },
   "require-dev": {
     "composer/composer": "^1.7.0",
@@ -32,7 +32,7 @@
     "phpstan/phpstan": "~0.11.15",
     "phpstan/phpstan-deprecation-rules": "~0.11.2",
     "phpstan/phpstan-strict-rules": "~0.11.1",
-    "phpunit/phpunit": "^6.5.13 || ^7.5.2",
+    "phpunit/phpunit": "^7.5.15",
     "symfony/filesystem": "^4.3.4"
   },
   "config": {