Merge 1f24b76 into d49733c

composer.json

@@ -6,18 +6,19 @@
     "require": {
         "php": "^7.2",
         "nette/utils": "^3.1",
-        "slevomat/coding-standard": "^6.2",
+        "slevomat/coding-standard": "^6.3",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12.18",
         "phpunit/phpunit": "^8.5|^9.0",
-        "rector/rector": "^0.7.9",
-        "symplify/changelog-linker": "^7.2",
-        "symplify/coding-standard": "^7.2",
-        "symplify/easy-coding-standard-tester": "^7.2",
-        "symplify/phpstan-extensions": "^7.2",
-        "tracy/tracy": "^2.7"
+        "rector/rector": "^0.7.43",
+        "symplify/changelog-linker": "^8.1",
+        "symplify/coding-standard": "^8.1",
+        "symplify/easy-coding-standard-tester": "^8.1",
+        "symplify/phpstan-extensions": "^8.1",
+        "tracy/tracy": "^2.7",
+        "phpstan/phpdoc-parser": "0.4.4 as 0.4.8"
     },
     "autoload": {
         "psr-4": {
@@ -31,9 +32,9 @@
     },
     "scripts": {
         "complete-check": ["@phpstan", "@check-cs", "phpunit"],
-        "phpstan": "phpstan analyze src tests --error-format symplify",
-        "check-cs": "ecs check",
-        "fix-cs": "ecs check --fix",
+        "phpstan": "phpstan analyze src tests --error-format symplify --ansi",
+        "check-cs": "ecs check --ansi",
+        "fix-cs": "ecs check --fix --ansi",
         "changelog": "changelog-linker dump-merges",
         "rector": "rector process --dry-run --config rector-ci.yaml --ansi"
     }

phpstan.neon

@@ -10,7 +10,7 @@ parameters:
         - src
         - tests
 
-    autoload_files:
+    bootstrapFiles:
         - 'tests/bootstrap.php'
 
     ignoreErrors:

tests/Sniffs/Classes/ForbiddenPublicPropertySniffTest.php

@@ -5,18 +5,18 @@
 use Iterator;
 use ObjectCalisthenics\Sniffs\Classes\ForbiddenPublicPropertySniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
-/**
- * @see ForbiddenPublicPropertySniff
- */
 final class ForbiddenPublicPropertySniffTest extends AbstractCheckerTestCase
 {
     /**
      * @dataProvider provideCorrectCases()
      */
     public function testCorrectCases(string $file): void
     {
-        $this->doTestCorrectFile($file);
+        $fileInfo = new SmartFileInfo($file);
+        $this->doTestFileInfo($fileInfo);
     }
 
     public function provideCorrectCases(): Iterator
@@ -27,18 +27,18 @@ public function provideCorrectCases(): Iterator
     /**
      * @dataProvider provideWrongCases()
      */
-    public function testWrongToFixed(string $wrongFile): void
+    public function testWrongToFixed(SmartFileInfo $wrongFile): void
     {
-        $this->doTestWrongFile($wrongFile);
+        $this->doTestFileInfoWithErrorCountOf($wrongFile, 1);
     }
 
     public function provideWrongCases(): Iterator
     {
-        yield [__DIR__ . '/wrong/wrong.php.inc'];
+        return StaticFixtureFinder::yieldDirectory(__DIR__ . '/Fixture');
     }
 
-    protected function provideConfig(): string
+    protected function getCheckerClass(): string
     {
-        return __DIR__ . '/config.yml';
+        return ForbiddenPublicPropertySniff::class;
     }
 }

tests/Sniffs/CodeAnalysis/OneObjectOperatorPerLineSniffTest.php

@@ -5,18 +5,18 @@
 use Iterator;
 use ObjectCalisthenics\Sniffs\CodeAnalysis\OneObjectOperatorPerLineSniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
-/**
- * @see OneObjectOperatorPerLineSniff
- */
 final class OneObjectOperatorPerLineSniffTest extends AbstractCheckerTestCase
 {
     /**
      * @dataProvider provideCorrectCases()
      */
     public function testCorrectCases(string $file): void
     {
-        $this->doTestCorrectFile($file);
+        $fileInfo = new SmartFileInfo($file);
+        $this->doTestFileInfo($fileInfo);
     }
 
     public function provideCorrectCases(): Iterator
@@ -27,20 +27,18 @@ public function provideCorrectCases(): Iterator
     /**
      * @dataProvider provideWrongCases()
      */
-    public function testWrongToFixed(string $wrongFile): void
+    public function testWrongToFixed(SmartFileInfo $wrongFileInfo): void
     {
-        $this->doTestWrongFile($wrongFile);
+        $this->doTestFileInfoWithErrorCountOf($wrongFileInfo, 1);
     }
 
     public function provideWrongCases(): Iterator
     {
-        yield [__DIR__ . '/wrong/wrong.php.inc'];
-        yield [__DIR__ . '/wrong/wrong2.php.inc'];
-        yield [__DIR__ . '/wrong/wrong3.php.inc'];
+        return StaticFixtureFinder::yieldDirectory(__DIR__ . '/Fixture');
     }
 
-    protected function provideConfig(): string
+    protected function getCheckerClass(): string
     {
-        return __DIR__ . '/config.yml';
+        return OneObjectOperatorPerLineSniff::class;
     }
 }

tests/Sniffs/ControlStructures/NoElseSniffTest.php

@@ -5,29 +5,26 @@
 use Iterator;
 use ObjectCalisthenics\Sniffs\ControlStructures\NoElseSniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
-/**
- * @see NoElseSniff
- */
 final class NoElseSniffTest extends AbstractCheckerTestCase
 {
     /**
      * @dataProvider provideWrongCases()
      */
-    public function testWrongToFixed(string $wrongFile): void
+    public function testWrongToFixed(SmartFileInfo $wrongFileInfo): void
     {
-        $this->doTestWrongFile($wrongFile);
+        $this->doTestFileInfoWithErrorCountOf($wrongFileInfo, 1);
     }
 
     public function provideWrongCases(): Iterator
     {
-        yield [__DIR__ . '/wrong/wrong.php.inc'];
-        yield [__DIR__ . '/wrong/wrong2.php.inc'];
-        yield [__DIR__ . '/wrong/wrong3.php.inc'];
+        return StaticFixtureFinder::yieldDirectory(__DIR__ . '/Fixture');
     }
 
-    protected function provideConfig(): string
+    protected function getCheckerClass(): string
     {
-        return __DIR__ . '/config.yml';
+        return NoElseSniff::class;
     }
 }

tests/Sniffs/Files/ClassTraitAndInterfaceLength/ClassTraitAndInterfaceLengthSniffTest.php

@@ -3,7 +3,9 @@
 namespace ObjectCalisthenics\Tests\Sniffs\Files\ClassTraitAndInterfaceLength;
 
 use Iterator;
+use ObjectCalisthenics\Sniffs\Files\ClassTraitAndInterfaceLengthSniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class ClassTraitAndInterfaceLengthSniffTest extends AbstractCheckerTestCase
 {
@@ -12,7 +14,8 @@ final class ClassTraitAndInterfaceLengthSniffTest extends AbstractCheckerTestCas
      */
     public function testWrongToFixed(string $wrongFile): void
     {
-        $this->doTestWrongFile($wrongFile);
+        $wrongFileInfo = new SmartFileInfo($wrongFile);
+        $this->doTestFileInfoWithErrorCountOf($wrongFileInfo, 1);
     }
 
     public function provideWrongCases(): Iterator
@@ -22,8 +25,8 @@ public function provideWrongCases(): Iterator
         yield [__DIR__ . '/wrong/wrong3.php.inc'];
     }
 
-    protected function provideConfig(): string
+    protected function getCheckerClass(): string
     {
-        return __DIR__ . '/config.yml';
+        return ClassTraitAndInterfaceLengthSniff::class;
     }
 }

tests/Sniffs/Files/FunctionLength/FunctionLengthSniffTest.php

@@ -5,18 +5,17 @@
 use Iterator;
 use ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
-/**
- * @see FunctionLengthSniff
- */
 final class FunctionLengthSniffTest extends AbstractCheckerTestCase
 {
     /**
      * @dataProvider provideWrongCases()
      */
     public function testWrongToFixed(string $wrongFile): void
     {
-        $this->doTestWrongFile($wrongFile);
+        $wrongFileInfo = new SmartFileInfo($wrongFile);
+        $this->doTestFileInfoWithErrorCountOf($wrongFileInfo, 1);
     }
 
     public function provideWrongCases(): Iterator
@@ -25,8 +24,8 @@ public function provideWrongCases(): Iterator
         yield [__DIR__ . '/wrong/wrong2.php.inc'];
     }
 
-    protected function provideConfig(): string
+    protected function getCheckerClass(): string
     {
-        return __DIR__ . '/config.yml';
+        return FunctionLengthSniff::class;
     }
 }

tests/Sniffs/Metrics/MaxNestingLevel/MaxNestingLevelSniffTest.php

@@ -2,30 +2,20 @@
 
 namespace ObjectCalisthenics\Tests\Sniffs\Metrics\MaxNestingLevel;
 
-use Iterator;
 use ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
-/**
- * @see MaxNestingLevelSniff
- */
 final class MaxNestingLevelSniffTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideWrongCases()
-     */
-    public function testWrongToFixed(string $wrongFile): void
+    public function testWrongToFixed(): void
     {
-        $this->doTestWrongFile($wrongFile);
+        $fileInfo = new SmartFileInfo(__DIR__ . '/wrong/wrong.php.inc');
+        $this->doTestFileInfo($fileInfo);
     }
 
-    public function provideWrongCases(): Iterator
+    protected function getCheckerClass(): string
     {
-        yield [__DIR__ . '/wrong/wrong.php.inc'];
-    }
-
-    protected function provideConfig(): string
-    {
-        return __DIR__ . '/config.yml';
+        return MaxNestingLevelSniff::class;
     }
 }

tests/Sniffs/Metrics/MethodPerClassLimit/MethodPerClassLimitSniffTest.php

@@ -2,26 +2,20 @@
 
 namespace ObjectCalisthenics\Tests\Sniffs\Metrics\MethodPerClassLimit;
 
-use Iterator;
+use ObjectCalisthenics\Sniffs\Metrics\MethodPerClassLimitSniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class MethodPerClassLimitSniffTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideWrongCases()
-     */
-    public function testWrongToFixed(string $wrongFile): void
+    public function testWrongToFixed(): void
     {
-        $this->doTestWrongFile($wrongFile);
+        $fileInfo = new SmartFileInfo(__DIR__ . '/wrong/wrong.php.inc');
+        $this->doTestFileInfo($fileInfo);
     }
 
-    public function provideWrongCases(): Iterator
+    protected function getCheckerClass(): string
     {
-        yield [__DIR__ . '/wrong/wrong.php.inc'];
-    }
-
-    protected function provideConfig(): string
-    {
-        return __DIR__ . '/config.yml';
+        return MethodPerClassLimitSniff::class;
     }
 }

tests/Sniffs/Metrics/PropertyPerClassLimit/PropertyPerClassLimitSniffTest.php

@@ -3,7 +3,9 @@
 namespace ObjectCalisthenics\Tests\Sniffs\Metrics\PropertyPerClassLimit;
 
 use Iterator;
+use ObjectCalisthenics\Sniffs\Metrics\PropertyPerClassLimitSniff;
 use Symplify\EasyCodingStandardTester\Testing\AbstractCheckerTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class PropertyPerClassLimitSniffTest extends AbstractCheckerTestCase
 {
@@ -12,29 +14,23 @@ final class PropertyPerClassLimitSniffTest extends AbstractCheckerTestCase
      */
     public function testCorrectCases(string $file): void
     {
-        $this->doTestCorrectFile($file);
+        $fileInfo = new SmartFileInfo($file);
+        $this->doTestFileInfo($fileInfo);
     }
 
     public function provideCorrectCases(): Iterator
     {
         yield [__DIR__ . '/correct/correct.php.inc'];
     }
 
-    /**
-     * @dataProvider provideWrongCases()
-     */
-    public function testWrongToFixed(string $wrongFile): void
-    {
-        $this->doTestWrongFile($wrongFile);
-    }
-
-    public function provideWrongCases(): Iterator
+    public function testWrongToFixed(): void
     {
-        yield [__DIR__ . '/wrong/wrong.php.inc'];
+        $fileInfo = new SmartFileInfo(__DIR__ . '/wrong/wrong.php.inc');
+        $this->doTestFileInfoWithErrorCountOf($fileInfo, 1);
     }
 
-    protected function provideConfig(): string
+    protected function getCheckerClass(): string
     {
-        return __DIR__ . '/config.yml';
+        return PropertyPerClassLimitSniff::class;
     }
 }