Merge pull request #155 from cpliakas/allow-symfony-34

Update ECS to 4.4
cpliakas · Jun 14, 2018 · 64aeb9e · 64aeb9e
2 parents aad80c6 + 8b613b5
commit 64aeb9e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 44 deletions.
diff --git a/composer.json b/composer.json
@@ -15,14 +15,14 @@
         "symfony/event-dispatcher": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^7.2",
         "symfony/filesystem": "^4.0",
         "psr/log": "1.0",
-        "symplify/easy-coding-standard": "^3.0",
-        "slam/php-cs-fixer-extensions": "^1.10",
-        "nette/utils": "^2.4",
+        "symplify/easy-coding-standard": "^4.4",
+        "slam/php-cs-fixer-extensions": "^1.16",
+        "nette/utils": "^2.5",
         "phpstan/phpstan": "^0.9",
-        "symplify/changelog-linker": "^3.0"
+        "symplify/changelog-linker": "^4.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon
diff --git a/ecs.yml b/ecs.yml
@@ -0,0 +1,33 @@
+imports:
+    - { resource: 'vendor/symplify/easy-coding-standard/config/psr2.yml' }
+    - { resource: 'vendor/symplify/easy-coding-standard/config/php71.yml' }
+    - { resource: 'vendor/symplify/easy-coding-standard/config/common.yml' }
+    - { resource: 'vendor/symplify/easy-coding-standard/config/clean-code.yml' }
+    - { resource: 'vendor/symplify/easy-coding-standard/config/symplify.yml' }
+
+services:
+    # Class should be Final or Abstract
+    SlamCsFixer\FinalInternalClassFixer: ~
+
+parameters:
+    exclude_checkers:
+        - 'PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\AssignmentInConditionSniff'
+        - 'Symplify\CodingStandard\Sniffs\DependencyInjection\NoClassInstantiationSniff'
+
+    skip:
+        SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff:
+            - 'tests/TestLogger.php'
+
+        Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenStaticFunctionSniff:
+            # helper method
+            - 'src/GitWrapper.php'
+            # parent interface → nothing we can do about this
+            - 'src/Event/GitLoggerListener.php'
+
+        SlamCsFixer\FinalInternalClassFixer:
+            # class with children
+            - 'src/Event/GitEvent.php'
+
+        Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenReferenceSniff:
+            # native PHP api → nothing we can do about this
+            - 'tests/StreamSuppressFilter.php'
diff --git a/src/GitCommand.php b/src/GitCommand.php
@@ -183,11 +183,7 @@ public function getCommandLine()
             return $this->getCommand();
         }
 
-        $command = array_merge(
-            [$this->getCommand()],
-            $this->buildOptions(),
-            $this->args
-        );
+        $command = array_merge([$this->getCommand()], $this->buildOptions(), $this->args);
 
         return array_filter($command);
     }

diff --git a/tests/GitWorkingCopyTest.php b/tests/GitWorkingCopyTest.php
@@ -18,7 +18,7 @@ final class GitWorkingCopyTest extends AbstractGitWrapperTestCase
     /**
      * Creates and initializes the local repository used for testing.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -403,9 +403,9 @@ public function testCommitWithAuthor(): void
 
         $git->add('commit.txt');
         $git->commit([
-                'm' => 'Committed testing branch.',
-                'a' => true,
-                'author' => 'test <test@lol.com>',
+            'm' => 'Committed testing branch.',
+            'a' => true,
+            'author' => 'test <test@lol.com>',
         ]);
 
         $output = $git->log();