test(coding standards): Fix some psalm errors

Author: julienloizelet

src/AlertsClient.php

@@ -23,10 +23,10 @@
  *     range?: string,
  *     since?: string,
  *     until?: string,
- *     simulated?: boolean,
- *     has_active_decision?: boolean,
+ *     simulated?: bool,
+ *     has_active_decision?: bool,
  *     decision_type?: string,
- *     limit?: number,
+ *     limit?: int,
  *     origin?: string
  * }
  *
@@ -38,7 +38,7 @@
  *     range?: string,
  *     since?: string,
  *     until?: string,
- *     has_active_decision?: boolean,
+ *     has_active_decision?: bool,
  *     alert_source?: string
  * }
  *
@@ -142,7 +142,7 @@ public function delete(array $query): array
 
     /**
      * @param positive-int $id
-     * @return TStoredAlert
+     * @return ?TStoredAlert
      */
     public function getById(int $id): ?array
     {
@@ -151,11 +151,11 @@ public function getById(int $id): ?array
             'GET',
             \sprintf('%s/%d', Constants::ALERTS, $id)
         );
-        // workaround for mutes 404 status.
-        if (empty($result['id'])) {
-            \assert($result['message'] === 'object not found');
+        // workaround for muted 404 status.
+        if (!isset($result['id'])) {
             return null;
         }
+        /** @var TStoredAlert */
         return $result;
     }
 

src/Configuration/Alert.php

@@ -47,7 +47,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->end()
         ;
         // @formatter:on
-        
+
         return $treeBuilder;
     }
 }

src/Payload/Alert.php

@@ -71,17 +71,17 @@
  *     leakspeed: string,
  *     simulated: bool,
  *     remediation: bool,
- *     source: TSource,
+ *     source?: TSource,
  *     events: list<TEvent>,
  *     decisions?: list<TDecision>,
  *     meta?: list<TMeta>,
- *     labels?: list<non-empty-string>
+ *     labels?: list<string>
  * }
  */
 class Alert implements \JsonSerializable
 {
     /**
-     * @var list<TProps>
+     * @var TProps
      */
     private $properties;
 
@@ -96,7 +96,7 @@ class Alert implements \JsonSerializable
     private $decisions = [];
 
     /**
-     * @var TSource
+     * @var ?TSource
      */
     private $source;
 
@@ -141,8 +141,20 @@ public function __construct(
     public static function fromArray(array $data): self
     {
         return new self(
-            $data,
-            $data['source'] ?? [],
+            [
+                'scenario' => $data['scenario'],
+                'scenario_hash' => $data['scenario_hash'],
+                'scenario_version' => $data['scenario_version'],
+                'message' => $data['message'],
+                'events_count' => $data['events_count'],
+                'start_at' => $data['start_at'],
+                'stop_at' => $data['stop_at'],
+                'capacity' => $data['capacity'],
+                'leakspeed' => $data['leakspeed'],
+                'simulated' => $data['simulated'],
+                'remediation' => $data['remediation'],
+            ],
+            $data['source'] ?? null,
             $data['events'] ?? [],
             $data['decisions'] ?? [],
             $data['meta'] ?? [],

tools/coding-standards/psalm/psalm.xml

@@ -1,24 +1,23 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="5"
-    resolveFromConfigFile="true"
-    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"
+        errorLevel="5"
+        resolveFromConfigFile="true"
+        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"
 >
     <projectFiles>
-        <directory name="../../../src" />
+        <directory name="../../../src"/>
         <ignoreFiles>
-            <directory name="../../../vendor" />
-            <directory name="../vendor" />
+            <directory name="../../../vendor"/>
+            <directory name="../vendor"/>
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
         <UndefinedInterfaceMethod>
             <errorLevel type="suppress">
                 <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::integerNode"/>
                 <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::scalarNode"/>
-                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::stringNode"/>
             </errorLevel>
         </UndefinedInterfaceMethod>
         <UndefinedMethod>
@@ -29,36 +28,6 @@
                 <file name="../../../src/Payload/Alert.php"/>
             </errorLevel>
         </UndefinedMethod>
-        <PropertyTypeCoercion>
-            <errorLevel type="suppress">
-                <referencedProperty name="CrowdSec\LapiClient\Payload\Alert::$properties"/>
-                <referencedProperty name="CrowdSec\LapiClient\Payload\Alert::$source"/>
-                <referencedProperty name="CrowdSec\LapiClient\Payload\Alert::$decisions"/>
-                <referencedProperty name="CrowdSec\LapiClient\Payload\Alert::$events"/>
-                <referencedProperty name="CrowdSec\LapiClient\Payload\Alert::$meta"/>
-                <referencedProperty name="CrowdSec\LapiClient\Metrics::$items"/>
-            </errorLevel>
-        </PropertyTypeCoercion>
-        <MissingClassConstType>
-            <errorLevel type="suppress">
-                <directory name="../../../src"/>
-            </errorLevel>
-        </MissingClassConstType>
-        <NonInvariantDocblockPropertyType>
-            <errorLevel type="suppress">
-                <file name="../../../src/AbstractLapiClient.php"/>
-            </errorLevel>
-        </NonInvariantDocblockPropertyType>
-        <MoreSpecificReturnType>
-            <errorLevel type="suppress">
-                <file name="../../../src/AlertsClient.php"/>
-            </errorLevel>
-        </MoreSpecificReturnType>
-        <LessSpecificReturnStatement>
-            <errorLevel type="suppress">
-                <file name="../../../src/AlertsClient.php"/>
-            </errorLevel>
-        </LessSpecificReturnStatement>
         <UndefinedDocblockClass>
             <errorLevel type="suppress">
                 <file name="../../../src/AlertsClient.php"/>
@@ -67,35 +36,20 @@
         <InvalidReturnStatement>
             <errorLevel type="suppress">
                 <file name="../../../src/AlertsClient.php"/>
-                <file name="../../../src/Payload/Alert.php"/>
             </errorLevel>
         </InvalidReturnStatement>
         <RiskyTruthyFalsyComparison>
             <errorLevel type="suppress">
                 <file name="../../../src/Bouncer.php"/>
             </errorLevel>
         </RiskyTruthyFalsyComparison>
-        <InvalidArgument>
-            <errorLevel type="suppress">
-                <file name="../../../src/Payload/Alert.php"/>
-            </errorLevel>
-        </InvalidArgument>
-        <InvalidReturnType>
-            <errorLevel type="suppress">
-                <file name="../../../src/Payload/Alert.php"/>
-            </errorLevel>
-        </InvalidReturnType>
-        <PropertyNotSetInConstructor>
-            <errorLevel type="suppress">
-                <file name="../../../src/Payload/Alert.php"/>
-            </errorLevel>
-        </PropertyNotSetInConstructor>
         <PossiblyNullReference>
             <errorLevel type="suppress">
                 <file name="../../../src/Configuration.php"/>
                 <file name="../../../src/Configuration/Metrics.php"/>
                 <file name="../../../src/Configuration/Metrics/Items.php"/>
                 <file name="../../../src/Configuration/Metrics/Meta.php"/>
+                <file name="../../../src/Configuration/Alert.php"/>
             </errorLevel>
         </PossiblyNullReference>
     </issueHandlers>