Skip to content

Commit 1325493

Browse files
keradusSpacePossum
authored andcommitted
Backport only new Diff v3 (#9)
1 parent 78bb099 commit 1325493

File tree

112 files changed

+101
-7110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+101
-7110
lines changed

LICENSE_GECKO

Lines changed: 0 additions & 19 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,4 @@ Code from `sebastian/diff` has been forked a republished by permission of Sebast
66
Licenced with BSD-3-Clause @ see LICENSE_DIFF, copyright (c) Sebastian Bergmann <[email protected]>
77
https://github.com/sebastianbergmann/diff
88

9-
Code from `GeckoPackages/GeckoDiffOutputBuilder` has been copied and republished by permission of GeckoPackages.
10-
Licenced with MIT @ see LICENSE_GECKO, copyright (c) GeckoPackages https://github.com/GeckoPackages
11-
https://github.com/GeckoPackages/GeckoDiffOutputBuilder/
12-
139
For questions visit us @ https://gitter.im/PHP-CS-Fixer/Lobby

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "php-cs-fixer/diff",
3-
"description": "sebastian/diff v2 backport support for PHP5.6",
3+
"description": "sebastian/diff v3 backport support for PHP 5.6+",
44
"keywords": ["diff"],
55
"homepage": "https://github.com/PHP-CS-Fixer",
66
"license": "BSD-3-Clause",
@@ -24,18 +24,18 @@
2424
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
2525
"symfony/process": "^3.3"
2626
},
27+
"config": {
28+
"optimize-autoloader": true,
29+
"sort-packages": true
30+
},
2731
"autoload": {
2832
"classmap": [
2933
"src/"
3034
]
3135
},
3236
"autoload-dev": {
3337
"psr-4": {
34-
"PhpCsFixer\\Diff\\v1_4\\Tests\\": "tests/v1_4",
35-
"PhpCsFixer\\Diff\\v2_0\\Tests\\": "tests/v2_0",
36-
"PhpCsFixer\\Diff\\v3_0\\": "tests/v3_0",
37-
"PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Tests\\": "tests/GeckoPackages/DiffOutputBuilder/Tests",
38-
"PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Utils\\": "tests/GeckoPackages/DiffOutputBuilder/Utils"
38+
"PhpCsFixer\\Diff\\": "tests"
3939
}
4040
}
4141
}

src/v3_0/Chunk.php renamed to src/Chunk.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace PhpCsFixer\Diff\v3_0;
11+
namespace PhpCsFixer\Diff;
1212

1313
final class Chunk
1414
{

src/v3_0/Diff.php renamed to src/Diff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace PhpCsFixer\Diff\v3_0;
11+
namespace PhpCsFixer\Diff;
1212

1313
final class Diff
1414
{

src/v3_0/Differ.php renamed to src/Differ.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace PhpCsFixer\Diff\v3_0;
11+
namespace PhpCsFixer\Diff;
1212

13-
use PhpCsFixer\Diff\v3_0\Output\DiffOutputBuilderInterface;
14-
use PhpCsFixer\Diff\v3_0\Output\UnifiedDiffOutputBuilder;
13+
use PhpCsFixer\Diff\Output\DiffOutputBuilderInterface;
14+
use PhpCsFixer\Diff\Output\UnifiedDiffOutputBuilder;
1515

1616
/**
1717
* Diff implementation.

src/v3_0/Exception/ConfigurationException.php renamed to src/Exception/ConfigurationException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace PhpCsFixer\Diff\v3_0;
11+
namespace PhpCsFixer\Diff;
1212

1313
final class ConfigurationException extends InvalidArgumentException
1414
{

src/v2_0/Exception/Exception.php renamed to src/Exception/Exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace PhpCsFixer\Diff\v2_0;
11+
namespace PhpCsFixer\Diff;
1212

1313
interface Exception
1414
{

src/v3_0/Exception/InvalidArgumentException.php renamed to src/Exception/InvalidArgumentException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
namespace PhpCsFixer\Diff\v3_0;
11+
namespace PhpCsFixer\Diff;
1212

1313
class InvalidArgumentException extends \InvalidArgumentException implements Exception
1414
{

src/GeckoPackages/DiffOutputBuilder/ConfigurationException.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)