Bump zing/coding-standard from ^5.2 to ^6.1 (#36)

* Bump zing/coding-standard from ^5.2 to ^6.1 * Add [0-9]+.x to branch
zingimmick · Feb 21, 2022 · e0daee5 · e0daee5
1 parent 9703ed9
commit e0daee5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - '[0-9]+.x'
 
 jobs:
   lint:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - '[0-9]+.x'
   schedule:
     - cron: '0 0 * * *'
 

diff --git a/composer.json b/composer.json
@@ -11,7 +11,10 @@
     ],
     "config": {
         "sort-packages": true,
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "require": {
         "php": "^7.2 || ^8.0",
@@ -23,7 +26,7 @@
         "nunomaduro/larastan": "^1.0",
         "orchestra/testbench": "^4.0 || ^5.0 || ^6.0",
         "phpunit/phpunit": "^8.0,<8.5.12 || ^9.3.3",
-        "zing/coding-standard": "^5.0"
+        "zing/coding-standard": "^6.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/ecs.php b/ecs.php
@@ -2,24 +2,16 @@
 
 declare(strict_types=1);
 
-use PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitInternalClassFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestClassRequiresCoversFixer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\EasyCodingStandard\ValueObject\Option;
 use Zing\CodingStandard\Set\ECSSetList;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(ECSSetList::PHP_72);
     $containerConfigurator->import(ECSSetList::CUSTOM);
-    $containerConfigurator->import(ECSSetList::PHP71_MIGRATION);
-    $containerConfigurator->import(ECSSetList::PHP71_MIGRATION_RISKY);
 
     $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::SKIP, [
-        YodaStyleFixer::class => null,
-        PhpUnitInternalClassFixer::class,
-        PhpUnitTestClassRequiresCoversFixer::class,
-    ]);
+    $parameters->set(Option::PARALLEL, true);
     $parameters->set(
         Option::PATHS,
         [__DIR__ . '/src', __DIR__ . '/tests', __DIR__ . '/ecs.php', __DIR__ . '/rector.php']

diff --git a/tests/DriverTest.php b/tests/DriverTest.php
@@ -9,7 +9,10 @@
 use Obs\ObsClient;
 use Zing\Flysystem\Obs\ObsAdapter;
 
-class DriverTest extends TestCase
+/**
+ * @internal
+ */
+final class DriverTest extends TestCase
 {
     public function testDriverRegistered(): void
     {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -8,7 +8,7 @@
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Zing\LaravelFlysystem\Obs\ObsServiceProvider;
 
-class TestCase extends BaseTestCase
+abstract class TestCase extends BaseTestCase
 {
     /**
      * @param mixed $app
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ on: @@
       push:
         branches:
           - master
+          - '[0-9]+.x'
     jobs:
       lint:
@@ Expand Down @@