From 28c12a47f13a53139d231cc698eac8cc06217fcf Mon Sep 17 00:00:00 2001
From: Vassyli <basilius.sauter@gmail.com>
Date: Thu, 24 Dec 2020 12:36:26 +0100
Subject: [PATCH] Collection of fixes to make tests run.

---
 composer.json                               |  3 ++-
 src/ComposerManager.php                     | 10 +++++-----
 src/Events/CharacterEventData.php           |  2 +-
 src/Events/ViewpointDecorationEventData.php |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index af89873..ce77c92 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
         "symfony/console": "*",
         "symfony/yaml": "*",
         "d11wtq/boris": "*",
-        "ramsey/uuid-doctrine": "*"
+        "ramsey/uuid-doctrine": "*",
+        "jetbrains/phpstorm-attributes": "*"
     },
     "repositories": [
         {
diff --git a/src/ComposerManager.php b/src/ComposerManager.php
index 8bb6ec7..bfca20d 100644
--- a/src/ComposerManager.php
+++ b/src/ComposerManager.php
@@ -18,7 +18,7 @@ use LotGD\Core\Exceptions\LibraryDoesNotExistException;
  */
 class ComposerManager
 {
-    private ?Composer $composer;
+    private ?Composer $composer = null;
 
     /**
      * Construct a manager with an optional working directory where composer.json
@@ -71,10 +71,10 @@ class ComposerManager
      */
     public function getPackages(): array
     {
-        return \array_merge(
-            [$this->getComposer()->getPackage()],
-            $this->getComposer()->getRepositoryManager()->getLocalRepository()->getPackages()
-        );
+        return [
+            $this->getComposer()->getPackage(),
+            ...$this->getComposer()->getRepositoryManager()->getLocalRepository()->getPackages(),
+        ];
     }
 
     /**
diff --git a/src/Events/CharacterEventData.php b/src/Events/CharacterEventData.php
index 27b3b69..5e34c45 100644
--- a/src/Events/CharacterEventData.php
+++ b/src/Events/CharacterEventData.php
@@ -21,7 +21,7 @@ class CharacterEventData extends EventContextData
             "required" => "bool",
         ],
     ])]
-    protected static array $argumentConfig = [
+    protected static ?array $argumentConfig = [
         "character" => ["type" => Character::class, "required" => true],
         "value" => ["type" => "mixed", "required" => false],
     ];
diff --git a/src/Events/ViewpointDecorationEventData.php b/src/Events/ViewpointDecorationEventData.php
index 03b6739..8619abd 100644
--- a/src/Events/ViewpointDecorationEventData.php
+++ b/src/Events/ViewpointDecorationEventData.php
@@ -17,7 +17,7 @@ class ViewpointDecorationEventData extends EventContextData
             "required" => "bool",
         ],
     ])]
-    protected static array $argumentConfig = [
+    protected static ?array $argumentConfig = [
         "viewpoint" => ["type" => Viewpoint::class, "required" => true],
     ];
 }