Fix psalm errors + Fix StyleCI config + Fix BC checker (#78)

vjik · web-flow · commit aead5ca5ee7f · 2023-03-31T14:25:48.000+03:00
diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml
@@ -3,13 +3,12 @@ on:
   - push
 
 name: backwards compatibility
+
 jobs:
   roave_bc_check:
-    name: Roave BC Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: fetch tags
-        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: Roave BC Check
-        uses: docker://nyholm/roave-bc-check-ga
+    uses: yiisoft/actions/.github/workflows/bc.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,20 +1,12 @@
 preset: psr12
 risky: true
 
-version: 8
+version: 8.1
 
 finder:
   exclude:
     - docs
     - vendor
-    - resources
-    - views
-    - public
-    - templates
-  not-name:
-    - UnionCar.php
-    - TimerUnionTypes.php
-    - schema1.php
 
 enabled:
   - alpha_ordered_traits
@@ -64,7 +56,6 @@ enabled:
   - phpdoc_order
   - phpdoc_property
   - phpdoc_scalar
-  - phpdoc_separation
   - phpdoc_singular_inheritdoc
   - phpdoc_trim
   - phpdoc_trim_consecutive_blank_line_separation
@@ -86,3 +77,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/psalm.xml b/psalm.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
diff --git a/src/MiddlewareFactory.php b/src/MiddlewareFactory.php
@@ -142,6 +142,7 @@ private function wrapCallable(array|callable $callable): MiddlewareInterface
     private function createCallableWrapper(callable $callback): MiddlewareInterface
     {
         return new class ($callback, $this->container, $this->parametersResolver) implements MiddlewareInterface {
+            /** @var callable */
             private $callback;
             /** @var ReflectionParameter[] */
             private array $callableParameters;

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ private function wrapCallable(array\|callable $callable): MiddlewareInterface`
`142`	`142`	`private function createCallableWrapper(callable $callback): MiddlewareInterface`
`143`	`143`	`{`
`144`	`144`	`return new class ($callback, $this->container, $this->parametersResolver) implements MiddlewareInterface {`
	`145`	`+ /** @var callable */`
`145`	`146`	`private $callback;`
`146`	`147`	`/** @var ReflectionParameter[] */`
`147`	`148`	`private array $callableParameters;`