Drop support for PHP 5

Author: sebastianbergmann

.php_cs

@@ -12,7 +12,7 @@ return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules(
         [
-            'array_syntax' => ['syntax' => 'long'],
+            'array_syntax' => ['syntax' => 'short'],
             'binary_operator_spaces' => [
                 'align_double_arrow' => true,
                 'align_equals' => true

.travis.yml

@@ -1,10 +1,6 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
   - 7.0
   - 7.0snapshot
   - 7.1

composer.json

@@ -15,10 +15,10 @@
         }
     ],
     "require": {
-        "php": "^5.3.3 || ^7.0"
+        "php": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+        "phpunit/phpunit": "^6.1"
     },
     "autoload": {
         "classmap": [
@@ -27,7 +27,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }

src/Chunk.php

@@ -44,7 +44,7 @@ class Chunk
      * @param int   $endRange
      * @param array $lines
      */
-    public function __construct($start = 0, $startRange = 1, $end = 0, $endRange = 1, array $lines = array())
+    public function __construct($start = 0, $startRange = 1, $end = 0, $endRange = 1, array $lines = [])
     {
         $this->start      = (int) $start;
         $this->startRange = (int) $startRange;

src/Diff.php

@@ -32,7 +32,7 @@ class Diff
      * @param string  $to
      * @param Chunk[] $chunks
      */
-    public function __construct($from, $to, array $chunks = array())
+    public function __construct($from, $to, array $chunks = [])
     {
         $this->from   = $from;
         $this->to     = $to;

src/Differ.php

@@ -10,10 +10,6 @@
 
 namespace SebastianBergmann\Diff;
 
-use SebastianBergmann\Diff\LongestCommonSubsequenceCalculator;
-use SebastianBergmann\Diff\TimeEfficientLongestCommonSubsequenceCalculator;
-use SebastianBergmann\Diff\MemoryEfficientLongestCommonSubsequenceCalculator;
-
 /**
  * Diff implementation.
  */
@@ -42,8 +38,8 @@ public function __construct($header = "--- Original\n+++ New\n", $showNonDiffLin
     /**
      * Returns the diff between two arrays or strings as string.
      *
-     * @param array|string             $from
-     * @param array|string             $to
+     * @param array|string                       $from
+     * @param array|string                       $to
      * @param LongestCommonSubsequenceCalculator $lcs
      *
      * @return string
@@ -92,7 +88,7 @@ private function checkIfDiffInOld(array $diff)
     {
         $inOld = false;
         $i     = 0;
-        $old   = array();
+        $old   = [];
 
         foreach ($diff as $line) {
             if ($line[1] === 0 /* OLD */) {
@@ -195,8 +191,8 @@ private function getDiffBufferElementNew(array $diff, $buffer, $diffIndex)
      * - 1: ADDED: $token was added to $from
      * - 0: OLD: $token is not changed in $to
      *
-     * @param array|string             $from
-     * @param array|string             $to
+     * @param array|string                       $from
+     * @param array|string                       $to
      * @param LongestCommonSubsequenceCalculator $lcs
      *
      * @return array
@@ -207,7 +203,7 @@ public function diffToArray($from, $to, LongestCommonSubsequenceCalculator $lcs
             $fromMatches = $this->getNewLineMatches($from);
             $from        = $this->splitStringByLines($from);
         } elseif (\is_array($from)) {
-            $fromMatches = array();
+            $fromMatches = [];
         } else {
             throw new \InvalidArgumentException('"from" must be an array or string.');
         }
@@ -216,7 +212,7 @@ public function diffToArray($from, $to, LongestCommonSubsequenceCalculator $lcs
             $toMatches = $this->getNewLineMatches($to);
             $to        = $this->splitStringByLines($to);
         } elseif (\is_array($to)) {
-            $toMatches = array();
+            $toMatches = [];
         } else {
             throw new \InvalidArgumentException('"to" must be an array or string.');
         }
@@ -228,47 +224,47 @@ public function diffToArray($from, $to, LongestCommonSubsequenceCalculator $lcs
         }
 
         $common = $lcs->calculate(\array_values($from), \array_values($to));
-        $diff   = array();
+        $diff   = [];
 
         if ($this->detectUnmatchedLineEndings($fromMatches, $toMatches)) {
-            $diff[] = array(
+            $diff[] = [
                 '#Warning: Strings contain different line endings!',
                 0
-            );
+            ];
         }
 
         foreach ($start as $token) {
-            $diff[] = array($token, 0 /* OLD */);
+            $diff[] = [$token, 0 /* OLD */];
         }
 
         \reset($from);
         \reset($to);
 
         foreach ($common as $token) {
             while (($fromToken = \reset($from)) !== $token) {
-                $diff[] = array(\array_shift($from), 2 /* REMOVED */);
+                $diff[] = [\array_shift($from), 2 /* REMOVED */];
             }
 
             while (($toToken = \reset($to)) !== $token) {
-                $diff[] = array(\array_shift($to), 1 /* ADDED */);
+                $diff[] = [\array_shift($to), 1 /* ADDED */];
             }
 
-            $diff[] = array($token, 0 /* OLD */);
+            $diff[] = [$token, 0 /* OLD */];
 
             \array_shift($from);
             \array_shift($to);
         }
 
         while (($token = \array_shift($from)) !== null) {
-            $diff[] = array($token, 2 /* REMOVED */);
+            $diff[] = [$token, 2 /* REMOVED */];
         }
 
         while (($token = \array_shift($to)) !== null) {
-            $diff[] = array($token, 1 /* ADDED */);
+            $diff[] = [$token, 1 /* ADDED */];
         }
 
         foreach ($end as $token) {
-            $diff[] = array($token, 0 /* OLD */);
+            $diff[] = [$token, 0 /* OLD */];
         }
 
         return $diff;
@@ -359,8 +355,8 @@ private function detectUnmatchedLineEndings(array $fromMatches, array $toMatches
      */
     private static function getArrayDiffParted(array &$from, array &$to)
     {
-        $start = array();
-        $end   = array();
+        $start = [];
+        $end   = [];
 
         \reset($to);
 
@@ -390,10 +386,10 @@ private static function getArrayDiffParted(array &$from, array &$to)
             \prev($from);
             \prev($to);
 
-            $end = array($fromK => $from[$fromK]) + $end;
+            $end = [$fromK => $from[$fromK]] + $end;
             unset($from[$fromK], $to[$toK]);
         } while (true);
 
-        return array($from, $to, $start, $end);
+        return [$from, $to, $start, $end];
     }
 }

src/MemoryEfficientLongestCommonSubsequenceCalculator.php

@@ -26,15 +26,15 @@ public function calculate(array $from, array $to)
         $cTo   = \count($to);
 
         if ($cFrom === 0) {
-            return array();
+            return [];
         }
 
         if ($cFrom === 1) {
             if (\in_array($from[0], $to, true)) {
-                return array($from[0]);
+                return [$from[0]];
             }
 
-            return array();
+            return [];
         }
 
         $i         = (int) ($cFrom / 2);

src/Parser.php

@@ -29,9 +29,9 @@ public function parse($string)
         }
 
         $lineCount = \count($lines);
-        $diffs     = array();
+        $diffs     = [];
         $diff      = null;
-        $collected = array();
+        $collected = [];
 
         for ($i = 0; $i < $lineCount; ++$i) {
             if (\preg_match('(^---\\s+(?P<file>\\S+))', $lines[$i], $fromMatch) &&
@@ -40,7 +40,7 @@ public function parse($string)
                     $this->parseFileDiff($diff, $collected);
 
                     $diffs[]   = $diff;
-                    $collected = array();
+                    $collected = [];
                 }
 
                 $diff = new Diff($fromMatch['file'], $toMatch['file']);
@@ -70,7 +70,7 @@ public function parse($string)
      */
     private function parseFileDiff(Diff $diff, array $lines)
     {
-        $chunks = array();
+        $chunks = [];
         $chunk  = null;
 
         foreach ($lines as $line) {
@@ -83,7 +83,7 @@ private function parseFileDiff(Diff $diff, array $lines)
                 );
 
                 $chunks[]  = $chunk;
-                $diffLines = array();
+                $diffLines = [];
 
                 continue;
             }

src/TimeEfficientLongestCommonSubsequenceCalculator.php

@@ -22,7 +22,7 @@ class TimeEfficientLongestCommonSubsequenceCalculator implements LongestCommonSu
      */
     public function calculate(array $from, array $to)
     {
-        $common     = array();
+        $common     = [];
         $fromLength = \count($from);
         $toLength   = \count($to);
         $width      = $fromLength + 1;

tests/ChunkTest.php

@@ -29,7 +29,7 @@ protected function setUp()
 
     public function testCanBeCreatedWithoutArguments()
     {
-        $this->assertInstanceOf('SebastianBergmann\Diff\Chunk', $this->chunk);
+        $this->assertInstanceOf(Chunk::class, $this->chunk);
     }
 
     public function testStartCanBeRetrieved()
@@ -54,14 +54,14 @@ public function testEndRangeCanBeRetrieved()
 
     public function testLinesCanBeRetrieved()
     {
-        $this->assertEquals(array(), $this->chunk->getLines());
+        $this->assertEquals([], $this->chunk->getLines());
     }
 
     public function testLinesCanBeSet()
     {
-        $this->assertEquals(array(), $this->chunk->getLines());
+        $this->assertEquals([], $this->chunk->getLines());
 
-        $testValue = array('line0', 'line1');
+        $testValue = ['line0', 'line1'];
         $this->chunk->setLines($testValue);
         $this->assertEquals($testValue, $this->chunk->getLines());
     }