Update dependencies (#181)

* update dependencies, fix tests * fix tests * fix tests * fix tests * fix tests Co-authored-by: Artjoms Suharevs <[email protected]>
matteosister · Apr 8, 2022 · c59d4fa · c59d4fa
1 parent 2af905e
commit c59d4fa
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 32 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,18 +12,16 @@ jobs:
     strategy:
       matrix:
         php:
-          - "7.3"
           - "7.4"
           - "8.0"
         symfony:
-          - 3.*
-          - 4.*
           - 5.*
+          - 6.*
         dependency-version:
           # - prefer-lowest
           - prefer-stable
         exclude:
-          - {php: "8.0", symfony: "3.*"}
+          - {php: "7.4", symfony: "6.*"}
 
     name: PHP ${{ matrix.php }} - S ${{ matrix.symfony }} - ${{ matrix.dependency-version }} - tests
     steps:

diff --git a/composer.json b/composer.json
@@ -19,9 +19,9 @@
     ],
     "require": {
         "php": ">=7.2.0",
-        "symfony/process": "~3.4|~4.0|~5.0",
-        "symfony/filesystem": "~3.4|~4.0|~5.0",
-        "symfony/finder": "~3.4|~4.0|~5.0",
+        "symfony/process": ">=3.4",
+        "symfony/filesystem": ">=3.4",
+        "symfony/finder": ">=3.4",
         "phpcollection/phpcollection": "~0.4|~0.5"
     },
     "require-dev": {

diff --git a/ecs.php b/ecs.php
@@ -2,30 +2,18 @@
 
 use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
-use Symplify\EasyCodingStandard\ValueObject\Option;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
+use Symplify\EasyCodingStandard\ValueObject\Option;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
-    $services = $containerConfigurator->services();
-    // $services->set(ArraySyntaxFixer::class)->call('configure', [
-    //     'syntax' => 'short'
-    // ]);
-
-    // $services->set(LineLengthFixer::class)->call('configure', [
-    //     "max_line_length" => 100,
-    //     "break_long_lines" => true, # default: true
-    //     "inline_short_lines" => false # default: true
-    // ]);
-
     $parameters = $containerConfigurator->parameters();
-
-    $parameters->set(Option::SETS, [
-        SetList::CLEAN_CODE,
-        SetList::PSR_12
-    ]);
-
     $parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/tests']);
 
-    $parameters->set(Option::SKIP, ['Unused variable $deleted.' => ['src/GitElephant/Objects/Diff/DiffChunk.php'], 'Unused variable $new.' => ['src/GitElephant/Objects/Diff/DiffChunk.php']]);
-};
+    // A. full sets
+    $containerConfigurator->import(SetList::PSR_12);
+
+    // B. standalone rule
+    $services = $containerConfigurator->services();
+    $services->set(ArraySyntaxFixer::class)
+             ->call('configure', [[ 'syntax' => 'short', ]]);
+};
diff --git a/src/GitElephant/Objects/Diff/DiffChunk.php b/src/GitElephant/Objects/Diff/DiffChunk.php
@@ -136,15 +136,17 @@ private function getLinesNumbers(string $line): void
             $this->originStartLine = $matches[1];
             $this->originEndLine = $matches[1];
         } else {
-            [$this->originStartLine, $this->originEndLine] = explode(',', $matches[1]);
+            $this->originStartLine = (int) explode(',', $matches[1])[0];
+            $this->originEndLine = (int) explode(',', $matches[1])[1];
         }
 
         if (!strpos($matches[2], ',')) {
             // one line
             $this->destStartLine = $matches[2];
             $this->destEndLine = $matches[2];
         } else {
-            [$this->destStartLine, $this->destEndLine] = explode(',', $matches[2]);
+            $this->destStartLine = (int) explode(',', $matches[2])[0];
+            $this->destEndLine = (int) explode(',', $matches[2])[1];
         }
     }
 

diff --git a/src/GitElephant/Objects/LogRange.php b/src/GitElephant/Objects/LogRange.php
@@ -128,7 +128,7 @@ private function parseOutputLines(array $outputLines): void
             $commitLines[] = $line;
         }
 
-        if (null !== $commitLines && count($commitLines) > 0) {
+        if (is_array($commitLines) && count($commitLines) !== 0) {
             $this->rangeCommits[] = Commit::createFromOutputLines($this->getRepository(), $commitLines);
         }
     }

diff --git a/tests/GitElephant/TestCase.php b/tests/GitElephant/TestCase.php
@@ -115,7 +115,7 @@ protected function tearDown(): void
             array_map(function (Repository $repo) use ($fs) {
                 $fs->remove($repo->getPath());
             }, $this->repository);
-        } else {
+        } elseif ($this->path) {
             $fs->remove($this->path);
         }
         m::close();