From 1012369d01935ff63f82866645ca1fb0009e5f23 Mon Sep 17 00:00:00 2001 From: Laurent Baey Date: Fri, 3 Jun 2022 16:07:09 +0200 Subject: [PATCH] Update easy-conding-standard usage to 10.2 --- README.md | 10 +++++----- ecs.php | 10 +++++----- tests/Sample.php | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 35e4a99..7729afc 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Installation & usage 2. Import the configuration file in your `ecs.php`: ```php - $containerConfigurator->import('vendor/mobizel/coding-standard/ecs.php'); + $ecsConfig->import('vendor/mobizel/coding-standard/ecs.php'); ``` Example config (ecs.php) @@ -26,10 +26,10 @@ Example config (ecs.php) import('vendor/mobizel/coding-standard/ecs.php'); +return static function (ECSConfig $ecsConfig): void { + $ecsConfig->import('vendor/mobizel/coding-standard/ecs.php'); $header = <<. @@ -40,7 +40,7 @@ For the full copyright and license information, please view the LICENSE file that was distributed with this source code. EOM; - $services = $containerConfigurator->services(); + $services = $ecsConfig->services(); $services ->set(HeaderCommentFixer::class) ->call('configure', [[ diff --git a/ecs.php b/ecs.php index 2f5e299..af6fd83 100644 --- a/ecs.php +++ b/ecs.php @@ -12,13 +12,13 @@ use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestClassRequiresCoversFixer; use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer; use PhpCsFixer\Fixer\Strict\StrictComparisonFixer; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; +use Symplify\EasyCodingStandard\Config\ECSConfig; use Symplify\EasyCodingStandard\ValueObject\Set\SetList; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::SYMFONY); +return static function (ECSConfig $ecsConfig): void { + $ecsConfig->import(SetList::PSR_12); - $services = $containerConfigurator->services(); + $services = $ecsConfig->services(); $services->set(DeclareStrictTypesFixer::class); $services->set(OrderedImportsFixer::class); $services->set(NoUnusedImportsFixer::class); @@ -33,7 +33,7 @@ $services->set(TrailingCommaInMultilineFixer::class) ->call('configure', [['elements' => ['arrays', 'arguments', 'parameters']]]); - $parameters = $containerConfigurator->parameters(); + $parameters = $ecsConfig->parameters(); $parameters->set('skip', [ VisibilityRequiredFixer::class => ['*Spec.php'], PhpUnitTestClassRequiresCoversFixer::class => ['*Test.php'], diff --git a/tests/Sample.php b/tests/Sample.php index 1bd86dc..a6a94bf 100644 --- a/tests/Sample.php +++ b/tests/Sample.php @@ -33,6 +33,6 @@ public function isIdentical(string $foo, string $bar): bool public function run(): void { /** @var string|null $description */ - $description = true ? 'This is a description' : null; + $description = true ? 'This is a' . ' description' : null; } }