From a55b77a925e203dbf1255073957e281fac27d383 Mon Sep 17 00:00:00 2001
From: Piotr <piotr.grzegorzewski@wenow.com>
Date: Mon, 17 Jun 2024 15:20:59 +0200
Subject: [PATCH] Bumped versions of PHP and Codeception. Added types for
 variables.

---
 composer.json                   | 9 +++++++--
 src/Clock/FakedClock.php        | 9 +++------
 src/Clock/FrozenClock.php       | 8 ++------
 src/Clock/RealClock.php         | 6 ++----
 src/CodeceptionHelper/Clock.php | 5 ++---
 src/Factory/ClockFactory.php    | 1 +
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index f335804..d0a78a8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         }
     },
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.0 || ^8.1",
         "jeckel-lab/contract": ">=1.1"
     },
     "require-dev": {
@@ -32,9 +32,14 @@
         "mikey179/vfsstream": "^1.6",
         "vimeo/psalm": "^4.3",
         "phpro/grumphp": "^0.19 || ^1.2.0",
-        "codeception/codeception": "^4.1"
+        "codeception/codeception": "^5.0.13"
     },
     "suggest": {
         "codeception/codeception": "Use helper to handle clock with your codeception tests"
+    },
+    "config": {
+        "allow-plugins": {
+            "phpro/grumphp": true
+        }
     }
 }
diff --git a/src/Clock/FakedClock.php b/src/Clock/FakedClock.php
index 6876ad3..5cba60c 100644
--- a/src/Clock/FakedClock.php
+++ b/src/Clock/FakedClock.php
@@ -22,14 +22,11 @@
  */
 class FakedClock implements Clock
 {
-    /** @var DateTimeImmutable */
-    protected $initialDatetime;
+    protected DateTimeImmutable $initialDatetime;
 
-    /** @var DateTimeZone */
-    private $timezone;
+    private DateTimeZone $timezone;
 
-    /** @var DateInterval */
-    private $diff;
+    private DateInterval $diff;
 
     /**
      * Clock constructor.
diff --git a/src/Clock/FrozenClock.php b/src/Clock/FrozenClock.php
index 8f8c313..4010199 100644
--- a/src/Clock/FrozenClock.php
+++ b/src/Clock/FrozenClock.php
@@ -21,13 +21,9 @@
  */
 class FrozenClock implements ClockInterface
 {
-    /**
-     * @var DateTimeImmutable
-     */
-    protected $now;
+    protected DateTimeImmutable $now;
 
-    /** @var DateTimeZone */
-    private $timezone;
+    private DateTimeZone $timezone;
 
     /**
      * FakeClock constructor.
diff --git a/src/Clock/RealClock.php b/src/Clock/RealClock.php
index ee2ad45..b7b16c7 100644
--- a/src/Clock/RealClock.php
+++ b/src/Clock/RealClock.php
@@ -21,14 +21,12 @@
  */
 class RealClock implements ClockInterface
 {
-    /**
-     * @var DateTimeZone
-     */
-    private $timezone;
+    private DateTimeZone $timezone;
 
     /**
      * Clock constructor.
      * @param DateTimeZone|null $timezone
+     * @throws Exception
      */
     public function __construct(?DateTimeZone $timezone = null)
     {
diff --git a/src/CodeceptionHelper/Clock.php b/src/CodeceptionHelper/Clock.php
index 347e15c..71793a7 100644
--- a/src/CodeceptionHelper/Clock.php
+++ b/src/CodeceptionHelper/Clock.php
@@ -14,7 +14,6 @@
 use Codeception\TestInterface;
 use Codeception\Util\Fixtures;
 use DateTimeImmutable;
-use DateTimeInterface;
 use InvalidArgumentException;
 use RuntimeException;
 
@@ -30,7 +29,7 @@ class Clock extends Module
      * @var string[]
      * @psalm-suppress NonInvariantDocblockPropertyType
      */
-    protected $config = [
+    protected array $config = [
         'date_format' => 'Y/m/d',
         'time_format' => 'H:i:s'
     ];
@@ -39,7 +38,7 @@ class Clock extends Module
      * @var array
      * @psalm-suppress NonInvariantDocblockPropertyType
      */
-    protected $requiredFields = ['fake_time_path', 'date_format', 'time_format'];
+    protected array $requiredFields = ['fake_time_path', 'date_format', 'time_format'];
 
     // @codingStandardsIgnoreStart
     /**
diff --git a/src/Factory/ClockFactory.php b/src/Factory/ClockFactory.php
index aac2b43..2afb782 100644
--- a/src/Factory/ClockFactory.php
+++ b/src/Factory/ClockFactory.php
@@ -23,6 +23,7 @@ class ClockFactory
      * @param array $config
      * @return ClockInterface
      * @throws RuntimeException
+     * @throws Exception
      */
     public static function getClock(array $config = []): ClockInterface
     {