Backport only new Diff v3

README.md

@@ -6,8 +6,4 @@ Code from `sebastian/diff` has been forked a republished by permission of Sebast
 Licenced with BSD-3-Clause @ see LICENSE_DIFF, copyright (c) Sebastian Bergmann <sebastian@phpunit.de>
 https://github.com/sebastianbergmann/diff
 
-Code from `GeckoPackages/GeckoDiffOutputBuilder` has been copied and republished by permission of GeckoPackages.
-Licenced with MIT @ see LICENSE_GECKO, copyright (c) GeckoPackages https://github.com/GeckoPackages
-https://github.com/GeckoPackages/GeckoDiffOutputBuilder/
-
 For questions visit us @ https://gitter.im/PHP-CS-Fixer/Lobby

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "php-cs-fixer/diff",
-    "description": "sebastian/diff v2 backport support for PHP5.6",
+    "description": "sebastian/diff v3 backport support for PHP 5.6+",
     "keywords": ["diff"],
     "homepage": "https://github.com/PHP-CS-Fixer",
     "license": "BSD-3-Clause",
@@ -24,18 +24,18 @@
         "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "symfony/process": "^3.3"
     },
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
+    },
     "autoload": {
         "classmap": [
             "src/"
         ]
     },
     "autoload-dev": {
         "psr-4": {
-            "PhpCsFixer\\Diff\\v1_4\\Tests\\": "tests/v1_4",
-            "PhpCsFixer\\Diff\\v2_0\\Tests\\": "tests/v2_0",
-            "PhpCsFixer\\Diff\\v3_0\\": "tests/v3_0",
-            "PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Tests\\": "tests/GeckoPackages/DiffOutputBuilder/Tests",
-            "PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Utils\\": "tests/GeckoPackages/DiffOutputBuilder/Utils"
+            "PhpCsFixer\\Diff\\": "tests"
         }
     }
 }

src/v3_0/Chunk.php → src/Chunk.php

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace PhpCsFixer\Diff\v3_0;
+namespace PhpCsFixer\Diff;
 
 final class Chunk
 {

src/v3_0/Diff.php → src/Diff.php

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace PhpCsFixer\Diff\v3_0;
+namespace PhpCsFixer\Diff;
 
 final class Diff
 {

src/v3_0/Differ.php → src/Differ.php

@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-namespace PhpCsFixer\Diff\v3_0;
+namespace PhpCsFixer\Diff;
 
-use PhpCsFixer\Diff\v3_0\Output\DiffOutputBuilderInterface;
-use PhpCsFixer\Diff\v3_0\Output\UnifiedDiffOutputBuilder;
+use PhpCsFixer\Diff\Output\DiffOutputBuilderInterface;
+use PhpCsFixer\Diff\Output\UnifiedDiffOutputBuilder;
 
 /**
  * Diff implementation.

src/v3_0/Exception/ConfigurationException.php → src/Exception/ConfigurationException.php

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace PhpCsFixer\Diff\v3_0;
+namespace PhpCsFixer\Diff;
 
 final class ConfigurationException extends InvalidArgumentException
 {

src/v2_0/Exception/Exception.php → src/Exception/Exception.php

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace PhpCsFixer\Diff\v2_0;
+namespace PhpCsFixer\Diff;
 
 interface Exception
 {

src/v3_0/Exception/InvalidArgumentException.php → src/Exception/InvalidArgumentException.php

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace PhpCsFixer\Diff\v3_0;
+namespace PhpCsFixer\Diff;
 
 class InvalidArgumentException extends \InvalidArgumentException implements Exception
 {