DevKit updates for 1.x branch (#384)

* DevKit updates * Fix cs Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>
sonata-project · Sep 3, 2022 · 9480415 · 9480415
1 parent 745425c
commit 9480415
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -45,6 +45,11 @@
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],
+    'phpdoc_order' => ['order' => ['var', 'param', 'throws', 'return', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return']],
+    'phpdoc_separation' => ['groups' => [
+        ['phpstan-template', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'],
+        ['psalm-suppress', 'phpstan-ignore-next-line'],
+    ]],
     'php_unit_strict' => true,
     'php_unit_test_case_static_method_calls' => true,
     'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress', 'phpstan-var']],

diff --git a/src/Type/BaseDoctrineORMSerializationType.php b/src/Type/BaseDoctrineORMSerializationType.php
@@ -53,6 +53,7 @@ class BaseDoctrineORMSerializationType extends AbstractType
 
     /**
      * @var string
+     *
      * @phpstan-var class-string
      */
     protected $class;

diff --git a/src/Type/BaseStatusType.php b/src/Type/BaseStatusType.php
@@ -21,6 +21,7 @@ abstract class BaseStatusType extends AbstractType
 {
     /**
      * @var string
+     *
      * @phpstan-var class-string
      */
     protected $class;

diff --git a/src/Validator/Constraints/InlineConstraint.php b/src/Validator/Constraints/InlineConstraint.php
@@ -19,6 +19,7 @@
  * Constraint which allows inline-validation inside services.
  *
  * @Annotation
+ *
  * @Target({"CLASS"})
  */
 final class InlineConstraint extends Constraint

diff --git a/src/Validator/ErrorElement.php b/src/Validator/ErrorElement.php
@@ -196,8 +196,6 @@ public function getSubject()
      * @param string|array{0?:string, 1?:array<string, mixed>, 2?:mixed} $message
      * @param array<string, mixed>                                       $parameters
      * @param mixed                                                      $value
-     *
-     * @return ErrorElement
      */
     public function addViolation($message, array $parameters = [], $value = null, string $translationDomain = self::DEFAULT_TRANSLATION_DOMAIN): self
     {
@@ -266,9 +264,9 @@ private function getValue()
     /**
      * @param array<string, mixed> $options
      *
-     * @return Constraint
-     *
      * @throws \RuntimeException
+     *
+     * @return Constraint
      */
     private function newConstraint(string $name, array $options = [])
     {