test(unit): Fix unit tests

Author: julienloizelet

src/AbstractLapiClient.php

@@ -80,7 +80,7 @@ protected function manageRequest(
     protected function manageAppSecRequest(
         string $method,
         array $headers = [],
-        string $rawBody = '',
+        string $rawBody = ''
     ): array {
         try {
             $this->logger->debug('Now processing a bouncer AppSec request', [

src/Configuration.php

@@ -205,8 +205,8 @@ private function validate($rootNode): void
     private function watcher(ArrayNodeDefinition $rootNode): void
     {
         $rootNode->children()
-            ->stringNode('machine_id')->end()
-            ->stringNode('password')->end()
+            ->scalarNode('machine_id')->end()
+            ->scalarNode('password')->end()
         ->end();
     }
 }

src/Configuration/Alert.php

@@ -30,14 +30,13 @@ public function getConfigTreeBuilder(): TreeBuilder
         $treeBuilder = new TreeBuilder('alert');
         /** @var ArrayNodeDefinition $rootNode */
         $rootNode = $treeBuilder->getRootNode();
-
         // @formatter:off
         $rootNode
             ->children()
-                ->stringNode('scenario')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('scenario_hash')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('scenario_version')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('message')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('scenario')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('scenario_hash')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('scenario_version')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('message')->isRequired()->cannotBeEmpty()->end()
                 ->integerNode('events_count')->isRequired()->min(0)->end()
                 ->scalarNode('start_at')->isRequired()->cannotBeEmpty()->end()
                 ->scalarNode('stop_at')->isRequired()->cannotBeEmpty()->end()
@@ -48,7 +47,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->end()
         ;
         // @formatter:on
-
+        
         return $treeBuilder;
     }
 }

src/Configuration/Alert/Decision.php

@@ -26,13 +26,13 @@ public function getConfigTreeBuilder(): TreeBuilder
         // @formatter:off
         $rootNode
             ->children()
-                ->stringNode('origin')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('type')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('scope')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('value')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('duration')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('until')->cannotBeEmpty()->end()
-                ->stringNode('scenario')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('origin')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('type')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('scope')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('value')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('duration')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('until')->cannotBeEmpty()->end()
+                ->scalarNode('scenario')->isRequired()->cannotBeEmpty()->end()
             ->end()
         ;
         // @formatter:on

src/Configuration/Alert/Event.php

@@ -24,8 +24,8 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->arrayNode('meta')->isRequired()
                     ->arrayPrototype()
                         ->children()
-                            ->stringNode('key')->isRequired()->cannotBeEmpty()->end()
-                            ->stringNode('value')->isRequired()->cannotBeEmpty()->end()
+                            ->scalarNode('key')->isRequired()->cannotBeEmpty()->end()
+                            ->scalarNode('value')->isRequired()->cannotBeEmpty()->end()
                         ->end()
                     ->end()
                 ->end()

src/Configuration/Alert/Source.php

@@ -28,13 +28,13 @@ public function getConfigTreeBuilder(): TreeBuilder
         // @formatter:off
         $rootNode
             ->children()
-                ->stringNode('scope')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('value')->isRequired()->cannotBeEmpty()->end()
-                ->stringNode('ip')->cannotBeEmpty()->end()
-                ->stringNode('range')->cannotBeEmpty()->end()
+                ->scalarNode('scope')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('value')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('ip')->cannotBeEmpty()->end()
+                ->scalarNode('range')->cannotBeEmpty()->end()
                 ->scalarNode('as_number')->cannotBeEmpty()->end()
-                ->stringNode('as_name')->cannotBeEmpty()->end()
-                ->stringNode('cn')->cannotBeEmpty()->end()
+                ->scalarNode('as_name')->cannotBeEmpty()->end()
+                ->scalarNode('cn')->cannotBeEmpty()->end()
                 ->floatNode('latitude')->min(-90)->max(90)->end()
                 ->floatNode('longitude')->min(-180)->max(180)->end()
             ->end()

src/Configuration/Metrics/Items.php

@@ -63,13 +63,13 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->variableNode('labels')
                         // Remove empty labels totally
                         ->beforeNormalization()
-                            ->ifTrue(function (mixed $value) {
+                            ->ifTrue(function ($value) {
                                 return empty($value);
                             })
                             ->thenUnset()
                         ->end()
                         ->validate()
-                            ->ifTrue(function (mixed $value) {
+                            ->ifTrue(function ($value) {
                                 // Ensure all values in the array are strings
                                 if (!is_array($value)) {
                                     return true;

src/Metrics.php

@@ -92,7 +92,7 @@ class Metrics
     public function __construct(
         array $properties,
         array $meta,
-        array $items = [],
+        array $items = []
     ) {
         $this->configureProperties($properties);
         $this->configureMeta($meta);

src/Payload/Alert.php

@@ -112,15 +112,15 @@ class Alert implements \JsonSerializable
 
     /**
      * @param TProps $properties
-     * @param TSource $source
+     * @param ?TSource $source
      * @param list<TEvent> $events
      * @param list<TDecision> $decisions
      * @param list<TMeta> $meta
      * @param list<string> $labels
      */
     public function __construct(
         array $properties,
-        array $source,
+        ?array $source,
         array $events = [],
         array $decisions = [],
         array $meta = [],
@@ -156,7 +156,9 @@ public static function fromArray(array $data): self
     public function toArray(): array
     {
         $result = $this->properties;
-        $result['source'] = $this->source;
+        if (null !== $this->source) {
+            $result['source'] = $this->source;
+        }
         $result['events'] = $this->events;
         if ([] !== $this->decisions) {
             $result['decisions'] = $this->decisions;

src/Storage/TokenStorage.php

@@ -42,7 +42,7 @@ public function retrieveToken(): ?string
             \assert(isset($tokenInfo['token']));
             $ci
                 ->set($tokenInfo['token'])
-                ->expiresAt(new DateTime($tokenInfo['expire']));
+                ->expiresAt(new DateTime('@' . $tokenInfo['expire']));
             $this->cache->save($ci);
         }
         return $ci->get();