Merge pull request #6 from mobizel/feature/add-new-rules

Add trailing coma in multiline and doc align left

Author: loic425

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ 7.4, 8.0 ]
+                php: [ "8.0", "8.1" ]
 
         steps:
             -   uses: actions/checkout@v2

composer.json

@@ -3,8 +3,8 @@
     "description": "Battle-tested coding standard configuration used at Mobizel.",
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
-        "symplify/easy-coding-standard": "^9.0"
+        "php": "^8.0",
+        "symplify/easy-coding-standard": "^10.0"
     },
     "autoload-dev": {
         "psr-4": {

ecs.php

@@ -2,9 +2,11 @@
 
 declare(strict_types=1);
 
+use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
 use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocAlignFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitInternalClassFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitMethodCasingFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestClassRequiresCoversFixer;
@@ -22,6 +24,15 @@
     $services->set(NoUnusedImportsFixer::class);
     $services->set(StrictComparisonFixer::class);
 
+    $services->set(PhpdocAlignFixer::class)
+        ->call('configure', [[
+            'align' => 'left',
+            'tags' => ['method', 'param', 'property', 'return', 'throws', 'type', 'var'],
+        ]]);
+
+    $services->set(TrailingCommaInMultilineFixer::class)
+        ->call('configure', [['elements' => ['arrays', 'arguments', 'parameters']]]);
+
     $parameters = $containerConfigurator->parameters();
     $parameters->set('skip', [
         VisibilityRequiredFixer::class => ['*Spec.php'],

tests/BookFactory.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Soliso project.
+ *
+ * (c) Mobizel
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\CodingStandard;
+
+use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Proxy;
+
+/**
+ * @extends ModelFactory<Sample>
+ *
+ * @method static Sample|Proxy createOne(array $attributes = [])
+ * @method static Sample[]|Proxy[] createMany(int $number, array|callable $attributes = [])
+ * @method static Sample|Proxy find(object|array|mixed $criteria)
+ * @method static Sample|Proxy findOrCreate(array $attributes)
+ * @method static Sample|Proxy first(string $sortedField = 'id')
+ * @method static Sample|Proxy last(string $sortedField = 'id')
+ * @method static Sample|Proxy random(array $attributes = [])
+ * @method static Sample|Proxy randomOrCreate(array $attributes = [])
+ * @method static Sample[]|Proxy[] all()
+ * @method static Sample[]|Proxy[] findBy(array $attributes)
+ * @method static Sample[]|Proxy[] randomSet(int $number, array $attributes = [])
+ * @method static Sample[]|Proxy[] randomRange(int $min, int $max, array $attributes = [])
+ * @method Sample|Proxy create(array|callable $attributes = [])
+ */
+final class DealerFactory extends ModelFactory
+{
+    protected function getDefaults(): array
+    {
+        return array_merge(parent::getDefaults(), [
+            'company_name' => self::faker()->company(),
+        ]);
+    }
+
+    protected static function getClass(): string
+    {
+        return Dealer::class;
+    }
+}

tests/Sample.php

@@ -8,6 +8,12 @@ class Sample
 {
     public const BAR = 'bar';
 
+    public function __construct(
+        public string $foo,
+        public string $bar,
+    ) {
+    }
+
     public function foo(): void
     {
     }