composer update ondrejmirtes/php-merge

Author: staabm

.github/workflows/tests.yml

@@ -226,7 +226,7 @@ jobs:
       - uses: ./build-infection/.github/actions/setup-php
         with:
           php-version: "${{ matrix.php-version }}"
-          extensions: ds,mbstring
+          php-extensions: ds,mbstring
 
       - uses: "ramsey/composer-install@v3"
 

composer.json

@@ -38,7 +38,7 @@
 		"react/promise": "^3.2",
 		"react/socket": "^1.3",
 		"react/stream": "^1.1",
-		"sebastian/diff": "^6.0.2",
+		"sebastian/diff": "^6.0.2 || ^7",
 		"symfony/console": "^5.4.3",
 		"symfony/finder": "^5.4.3",
 		"symfony/polyfill-intl-grapheme": "^1.23",