sebastianbergmann · Aug 22, 2017 · Aug 22, 2017 · Aug 23, 2017 · Sep 18, 2017 · Sep 18, 2017
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,13 @@
+tests/ export-ignore
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.php_cs export-ignore
+.travis.yml export-ignore
+build.xml export-ignore
+phpunit.xml.dist export-ignore
+*       text=auto eol=lf
+*.php   text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
+*.json  text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.yml   text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.md    text whitespace=blank-at-eol,blank-at-eof
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/PHP-CS-Fixer/diff/security/advisories/new) tab.
+
+Report security bugs in third-party libraries to the person or team maintaining that library.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-/.idea
 /composer.lock
-/vendor
-/.php_cs.cache
-/from.txt.orig
+/phpunit.xml
+/vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -1,27 +1,34 @@
 language: php
 
-php:
-  - 7.0
-  - 7.0snapshot
-  - 7.1
-  - 7.1snapshot
-  - master
+git:
+    depth: 1
 
 sudo: false
 
-before_install:
-  - composer self-update
-  - composer clear-cache
+matrix:
+    fast_finish: true
+    include:
+        - php: 5.6
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+        - php: 7.0
+          env: COMPOSER_FLAGS="--prefer-stable"
+        - php: 7.1
+          env: COMPOSER_FLAGS="--prefer-stable"
+        - php: 7.2
+          env: COMPOSER_FLAGS="--prefer-stable"
+        - php: 7.3
+          env: COMPOSER_FLAGS="--prefer-stable"
+        - php: 7.4
+          env: COMPOSER_FLAGS="--prefer-stable"
+        - php: nightly
+          env: COMPOSER_FLAGS="--dev --ignore-platform-reqs"
+    allow_failures:
+        - php: nightly
 
 install:
-  - travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader --prefer-stable
+    - travis_retry composer update $COMPOSER_FLAGS --no-interaction -v
+    - composer info -D | sort
 
 script:
-  - ./vendor/bin/phpunit --coverage-clover=coverage.xml
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-
-notifications:
-  email: false
-
+  - phpenv config-rm xdebug.ini || return 0
+  - ./vendor/bin/phpunit --verbose
diff --git a/ChangeLog.md b/ChangeLog.md
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,3 @@
-sebastian/diff
-
 Copyright (c) 2002-2017, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 

diff --git a/README.md b/README.md
@@ -1,126 +1,10 @@
-# sebastian/diff
+# PHP-CS-Fixer/diff
 
-Diff implementation for PHP, factored out of PHPUnit into a stand-alone component.
+This version is for PHP CS Fixer only! Do not use it!
 
-## Installation
+Code from `sebastian/diff` has been forked a republished by permission of Sebastian Bergmann.
+Main change is to make the package compatible with older PHP engines.
+Licenced with BSD-3-Clause @ see LICENSE, copyright (c) Sebastian Bergmann <sebastian@phpunit.de>
+https://github.com/sebastianbergmann/diff
 
-You can add this library as a local, per-project dependency to your project using [Composer](https://getcomposer.org/):
-
-    composer require sebastian/diff
-
-If you only need this library during development, for instance to run your project's test suite, then you should add it as a development-time dependency:
-
-    composer require --dev sebastian/diff
-
-### Usage
-
-The `Differ` class can be used to generate a textual representation of the difference between two strings:
-
-```php
-use SebastianBergmann\Diff\Differ;
-
-$differ = new Differ;
-print $differ->diff('foo', 'bar');
-```
-
-The code above yields the output below:
-
-    --- Original
-    +++ New
-    @@ @@
-    -foo
-    +bar
-
-The `Parser` class can be used to parse a unified diff into an object graph:
-
-```php
-use SebastianBergmann\Diff\Parser;
-use SebastianBergmann\Git;
-
-$git = new Git('/usr/local/src/money');
-
-$diff = $git->getDiff(
-  '948a1a07768d8edd10dcefa8315c1cbeffb31833',
-  'c07a373d2399f3e686234c4f7f088d635eb9641b'
-);
-
-$parser = new Parser;
-
-print_r($parser->parse($diff));
-```
-
-The code above yields the output below:
-
-    Array
-    (
-        [0] => SebastianBergmann\Diff\Diff Object
-            (
-                [from:SebastianBergmann\Diff\Diff:private] => a/tests/MoneyTest.php
-                [to:SebastianBergmann\Diff\Diff:private] => b/tests/MoneyTest.php
-                [chunks:SebastianBergmann\Diff\Diff:private] => Array
-                    (
-                        [0] => SebastianBergmann\Diff\Chunk Object
-                            (
-                                [start:SebastianBergmann\Diff\Chunk:private] => 87
-                                [startRange:SebastianBergmann\Diff\Chunk:private] => 7
-                                [end:SebastianBergmann\Diff\Chunk:private] => 87
-                                [endRange:SebastianBergmann\Diff\Chunk:private] => 7
-                                [lines:SebastianBergmann\Diff\Chunk:private] => Array
-                                    (
-                                        [0] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::add
-                                            )
-
-                                        [1] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::newMoney
-                                            )
-
-                                        [2] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      */
-                                            )
-
-                                        [3] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 2
-                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyWithSameCurrencyObjectCanBeAdded()
-                                            )
-
-                                        [4] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 1
-                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyObjectWithSameCurrencyCanBeAdded()
-                                            )
-
-                                        [5] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>     {
-                                            )
-
-                                        [6] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>         $a = new Money(1, new Currency('EUR'));
-                                            )
-
-                                        [7] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>         $b = new Money(2, new Currency('EUR'));
-                                            )
-
-                                    )
-
-                            )
-
-                    )
-
-            )
-
-    )
+For questions visit us @ https://gitter.im/PHP-CS-Fixer/Lobby
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "sebastian/diff",
-    "description": "Diff implementation",
+    "name": "php-cs-fixer/diff",
+    "description": "sebastian/diff v3 backport support for PHP 5.6+",
     "keywords": ["diff"],
-    "homepage": "https://github.com/sebastianbergmann/diff",
+    "homepage": "https://github.com/PHP-CS-Fixer",
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -15,19 +15,24 @@
         }
     ],
     "require": {
-        "php": "^7.0"
+        "php": "^5.6 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.2"
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
+        "symfony/process": "^3.3"
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
     },
     "autoload": {
         "classmap": [
             "src/"
         ]
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0-dev"
+    "autoload-dev": {
+        "psr-4": {
+            "PhpCsFixer\\Diff\\": "tests"
         }
     }
 }
diff --git a/phpunit.xml → phpunit.xml.dist b/phpunit.xml → phpunit.xml.dist
diff --git a/src/Chunk.php b/src/Chunk.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 /*
  * This file is part of sebastian/diff.
  *
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace SebastianBergmann\Diff;
+namespace PhpCsFixer\Diff;
 
 final class Chunk
 {
@@ -33,11 +33,11 @@ final class Chunk
     private $endRange;
 
     /**
-     * @var array
+     * @var Line[]
      */
     private $lines;
 
-    public function __construct(int $start = 0, int $startRange = 1, int $end = 0, int $endRange = 1, array $lines = [])
+    public function __construct($start = 0, $startRange = 1, $end = 0, $endRange = 1, array $lines = [])
     {
         $this->start      = $start;
         $this->startRange = $startRange;
@@ -46,33 +46,45 @@ public function __construct(int $start = 0, int $startRange = 1, int $end = 0, i
         $this->lines      = $lines;
     }
 
-    public function getStart(): int
+    public function getStart()
     {
         return $this->start;
     }
 
-    public function getStartRange(): int
+    public function getStartRange()
     {
         return $this->startRange;
     }
 
-    public function getEnd(): int
+    public function getEnd()
     {
         return $this->end;
     }
 
-    public function getEndRange(): int
+    public function getEndRange()
     {
         return $this->endRange;
     }
 
-    public function getLines(): array
+    /**
+     * @return Line[]
+     */
+    public function getLines()
     {
         return $this->lines;
     }
 
+    /**
+     * @param Line[] $lines
+     */
     public function setLines(array $lines)
     {
+        foreach ($lines as $line) {
+            if (!$line instanceof Line) {
+                throw new InvalidArgumentException;
+            }
+        }
+
         $this->lines = $lines;
     }
 }