Merge pull request #20 from irontec/enhanced-hints

[BC] Changed createDto method signature
irontec · Nov 30, 2023 · f39310b · f39310b
2 parents 8a7d8e6 + 8f6a1dd
commit f39310b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/Domain/Model/Changelog/ChangelogAbstract.php b/Domain/Model/Changelog/ChangelogAbstract.php
@@ -84,7 +84,10 @@ protected function sanitizeValues(): void
     {
     }
 
-    public static function createDto(string|int|null $id = null): ChangelogDto
+    /**
+     * @param string|null $id
+     */
+    public static function createDto($id = null): ChangelogDto
     {
         return new ChangelogDto($id);
     }

diff --git a/Domain/Model/Changelog/ChangelogInterface.php b/Domain/Model/Changelog/ChangelogInterface.php
@@ -32,7 +32,10 @@ public function replaceData($data = null);
      */
     public function getId(): ?string;
 
-    public static function createDto(string|int|null $id = null): ChangelogDto;
+    /**
+     * @param string|null $id
+     */
+    public static function createDto($id = null): ChangelogDto;
 
     /**
      * @internal use EntityTools instead

diff --git a/Domain/Model/ChangelogTrait.php b/Domain/Model/ChangelogTrait.php
@@ -24,7 +24,11 @@ trait ChangelogTrait
 
     abstract public function getId();
     abstract protected function __toArray();
-    abstract public static function createDto(string|int $id = null): DataTransferObjectInterface;
+
+    /**
+     * @param string|null $id
+     */
+    abstract public static function createDto($id = null): DataTransferObjectInterface;
 
     /**
      * TRUE on new entities until transaction is closed

diff --git a/Domain/Model/Commandlog/CommandlogAbstract.php b/Domain/Model/Commandlog/CommandlogAbstract.php
@@ -87,7 +87,10 @@ protected function sanitizeValues(): void
     {
     }
 
-    public static function createDto(string|int|null $id = null): CommandlogDto
+    /**
+     * @param string|null $id
+     */
+    public static function createDto($id = null): CommandlogDto
     {
         return new CommandlogDto($id);
     }

diff --git a/Domain/Model/Commandlog/CommandlogInterface.php b/Domain/Model/Commandlog/CommandlogInterface.php
@@ -25,7 +25,10 @@ public function getId(): ?string;
      */
     public static function fromEvent(CommandEventInterface $event);
 
-    public static function createDto(string|int|null $id = null): CommandlogDto;
+    /**
+     * @param string|null $id
+     */
+    public static function createDto($id = null): CommandlogDto;
 
     /**
      * @internal use EntityTools instead

diff --git a/Infrastructure/Persistence/Redis/FakeRedisMasterFactory.php b/Infrastructure/Persistence/Redis/FakeRedisMasterFactory.php
@@ -25,7 +25,7 @@ public function rPush($key, ...$value1) { return false; }
 
             public function blPop($key, $timeout_or_key, ...$extra_args) { return []; }
 
-            public function scan(&$iterator, $pattern = null, $count = 0)
+            public function scan(&$iterator, $pattern = null, $count = 0, ...$extra_args)
             {
                 $iterator = 0;
                 return ['something'];