Update StyleCI config (#114)

yiisoft · Apr 2, 2023 · 87331a9 · 87331a9
1 parent 286e67b
commit 87331a9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 29 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,21 +1,13 @@
 preset: psr12
 risky: true
 
-version: 8
+version: 8.1
 
 finder:
   exclude:
     - docs
     - vendor
-    - resources
-    - views
-    - public
-    - templates
-    - extractorExamples
-  not-name:
-    - UnionCar.php
-    - TimerUnionTypes.php
-    - schema1.php
+    - tests/extractorExamples
 
 enabled:
   - alpha_ordered_traits
@@ -65,7 +57,6 @@ enabled:
   - phpdoc_order
   - phpdoc_property
   - phpdoc_scalar
-  - phpdoc_separation
   - phpdoc_singular_inheritdoc
   - phpdoc_trim
   - phpdoc_trim_consecutive_blank_line_separation
@@ -87,3 +78,9 @@ enabled:
   - trailing_comma_in_multiline_array
   - unalign_double_arrow
   - unalign_equals
+  - empty_loop_body_braces
+  - integer_literal_case
+  - union_type_without_spaces
+
+disabled:
+  - function_declaration
diff --git a/tests/extractorExamples/synthetic/correctSamples/test-static.php b/tests/extractorExamples/synthetic/correctSamples/test-static.php
@@ -3,4 +3,3 @@
 $translator::translate('messageId2', [1, 2]);
 $translator::translate('message' . 'Id3', [1, 2]);
 $translator::translate('message' . 'Id4', [1, 2]);
-
diff --git a/tests/extractorExamples/synthetic/correctSamples/test.php b/tests/extractorExamples/synthetic/correctSamples/test.php
@@ -1,7 +1,7 @@
 <?php
+
 /**
  * @var Yiisoft\Translator\Translator $translator
- *
  */
 
 $translator
@@ -57,11 +57,11 @@
 // With categoryName and complex params
 $translator->translate('messageId1', ['1', 2], 'categoryName2');
 $translator->translate('messageId2', [1, '2'], 'categoryName2');
-$translator->translate('message' . 'Id3', ["1", '2'], 'categoryName2');
-$translator->translate('message' . 'Id4', ["1", '2'], 'categoryName2');
+$translator->translate('message' . 'Id3', ['1', '2'], 'categoryName2');
+$translator->translate('message' . 'Id4', ['1', '2'], 'categoryName2');
 
-$translator->translate('message' . "Id" . 5, [null, 2], 'categoryName2');
-$translator->translate("message" . 'Id' . 6, [null, 2], 'categoryName2');
+$translator->translate('message' . 'Id' . 5, [null, 2], 'categoryName2');
+$translator->translate('message' . 'Id' . 6, [null, 2], 'categoryName2');
 
 $translator->translate('messageId7', ['n' => 1], 'categoryName2');
 $translator->translate('messageId8', ['s', 't' => 2,], 'categoryName2');
@@ -81,9 +81,10 @@
 */
 
 $translator->translate('Сообщение1', [], 'Категория1');
-$translator->translate('Сообщение2', $translator::test(),
+$translator->translate(
+    'Сообщение2',
+    $translator::test(),
     // 345
-    'Категория1');
+    'Категория1'
+);
 $translator->translate->translate('Сообщение3' /* 123 */, /* 123 */ $translator::test(), 'Категория1');
-
-
diff --git a/tests/extractorExamples/user-main/src/ActiveRecord/Token.php b/tests/extractorExamples/user-main/src/ActiveRecord/Token.php
@@ -54,14 +54,12 @@ public function getUserId(): string
 
     public function toUrl(): string
     {
-        $route = match ($this->getAttribute('type')) {
+        return match ($this->getAttribute('type')) {
             self::TYPE_CONFIRMATION => 'confirm',
             self::TYPE_RECOVERY => 'reset',
             self::TYPE_CONFIRM_NEW_EMAIL, self::TYPE_CONFIRM_OLD_EMAIL => 'email/attempt',
             default => throw new RuntimeException('Url not available.'),
         };
-
-        return $route;
     }
 
     public function isExpired(int $tokenConfirmWithin = 0, int $tokenRecoverWithin = 0): bool

diff --git a/tests/extractorExamples/user-main/src/Helper/TimeZone.php b/tests/extractorExamples/user-main/src/Helper/TimeZone.php
@@ -20,14 +20,14 @@ public function getAll(): array
             $name = str_replace('_', ' ', $timeZone);
             $date = new DateTime('now', new DateTimeZone($timeZone));
 
-            array_push(
-                $timeZones,
+
+                $timeZones[] =
                 [
                     'timezone' => $timeZone,
                     'name' => "{$name} (UTC {$date->format('P')})",
                     'offset' => $date->getOffset(),
                 ]
-            );
+            ;
         }
 
         ArraySorter::multisort($timeZones, 'offset', SORT_ASC, SORT_NUMERIC);

diff --git a/tests/extractorExamples/user-main/src/Repository/RepositoryUser.php b/tests/extractorExamples/user-main/src/Repository/RepositoryUser.php
@@ -52,7 +52,6 @@ public function __construct(
     }
 
     /**
-     *
      * @return IdentityInterface|null
      * @psalm-suppress InvalidReturnType, InvalidReturnStatement
      */
@@ -183,7 +182,6 @@ public function register(FormRegister $formRegister, bool $isConfirmation, bool
      *
      * @param int $length
      *
-     *
      * {@see https://gist.github.com/tylerhall/521810}
      * @psalm-suppress MixedOperand, PossiblyInvalidArrayOffset
      */