comparison vendor/sebastian/diff/src/Parser.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

-<?php
+<?php declare(strict_types=1);
 /*
  * This file is part of sebastian/diff.
  *
  * (c) Sebastian Bergmann <[e-mail]>
  *

 namespace SebastianBergmann\Diff;
 
 /**
  * Unified diff parser.
  */
-class Parser
+final class Parser
 {
     /**
      * @param string $string
      *
      * @return Diff[]
      */
-    public function parse($string)
+    public function parse(string $string): array
     {
         $lines = \preg_split('(\r\n|\r|\n)', $string);
 
-        if (!empty($lines) && $lines[\count($lines) - 1] == '') {
+        if (!empty($lines) && $lines[\count($lines) - 1] === '') {
             \array_pop($lines);
         }
 
         $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) &&
                 \preg_match('(^\\+\\+\\+\\s+(?P<file>\\S+))', $lines[$i + 1], $toMatch)) {
                 if ($diff !== null) {
                     $this->parseFileDiff($diff, $collected);
 
                     $diffs[]   = $diff;
-                    $collected = array();
+                    $collected = [];
                 }
 
                 $diff = new Diff($fromMatch['file'], $toMatch['file']);
 
                 ++$i;

         }
 
         return $diffs;
     }
 
-    /**
-     * @param Diff  $diff
-     * @param array $lines
-     */
     private function parseFileDiff(Diff $diff, array $lines)
     {
-        $chunks = array();
+        $chunks = [];
         $chunk  = null;
 
         foreach ($lines as $line) {
             if (\preg_match('/^@@\s+-(?P<start>\d+)(?:,\s*(?P<startrange>\d+))?\s+\+(?P<end>\d+)(?:,\s*(?P<endrange>\d+))?\s+@@/', $line, $match)) {
                 $chunk = new Chunk(
-                    $match['start'],
-                    isset($match['startrange']) ? \max(1, $match['startrange']) : 1,
-                    $match['end'],
-                    isset($match['endrange']) ? \max(1, $match['endrange']) : 1
+                    (int) $match['start'],
+                    isset($match['startrange']) ? \max(1, (int) $match['startrange']) : 1,
+                    (int) $match['end'],
+                    isset($match['endrange']) ? \max(1, (int) $match['endrange']) : 1
                 );
 
                 $chunks[]  = $chunk;
-                $diffLines = array();
+                $diffLines = [];
 
                 continue;
             }
 
             if (\preg_match('/^(?P<type>[+ -])?(?P<line>.*)/', $line, $match)) {