Merge pull request #223 from andrew-demb/styleci-fix

Fix StyleCI checks
webmozarts · Dec 2, 2020 · 088006b · 088006b
2 parents bafc69c + ac13163
commit 088006b
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 74 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -9,3 +9,5 @@ enabled:
 
 disabled:
   - phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198
+  - short_array_syntax # Support PHP 5
+  - no_superfluous_phpdoc_tags_symfony # All params/return tags should be preserved
diff --git a/bin/src/MixinGenerator.php b/bin/src/MixinGenerator.php
@@ -122,7 +122,7 @@ private function interface(ReflectionClass $assert): string
      */
     private function nullOr(ReflectionMethod $method, int $indent): ?string
     {
-        return $this->assertion($method, 'nullOr%s', 'null|%s', $indent);
+        return $this->assertion($method, 'nullOr%s', '%s|null', $indent);
     }
 
     /**
@@ -157,7 +157,7 @@ private function assertion(ReflectionMethod $method, string $methodNameTemplate,
         $parsedComment = $this->parseDocComment($comment);
 
         $parameters = [];
-        /** @psalm-var array<string, null|scalar> $parametersDefaults */
+        /** @psalm-var array<string, scalar|null> $parametersDefaults */
         $parametersDefaults = [];
         $parametersReflection = $method->getParameters();
 
@@ -262,7 +262,7 @@ private function applyTypeTemplate(string $type, string $typeTemplate): string
     {
         $combinedType = sprintf($typeTemplate, $type);
 
-        if ('null|empty' === $combinedType) {
+        if ('empty|null' === $combinedType) {
             $combinedType = 'empty'; // @see https://github.com/vimeo/psalm/issues/3492
         }