Draft: Strict-Code and PHP8 Requirement

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
+        "php": "^8.1",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.5.7|^7.4.4"
     },

src/Novu.php

@@ -22,33 +22,7 @@ class Novu
         Actions\ManagesNotificationGroups,
         Actions\ManagesNotificationTemplates;
 
-    /**
-     * The Novu API Key.
-     *
-     * @var string
-     */
-    protected $apiKey;
-
-     /**
-     * The Novu API Base URL.
-     *
-     * @var string
-     */
-    protected $baseUri = 'https://api.novu.co/v1/';
-
-    /**
-     * The Guzzle HTTP Client instance.
-     *
-     * @var \GuzzleHttp\Client
-     */
-    public $client;
-
-    /**
-     * Number of seconds a request is retried.
-     *
-     * @var int
-     */
-    public $timeout = 30;
+
 
     /**
      * Create a new Novu instance.
@@ -57,23 +31,44 @@ class Novu
      * @param  \GuzzleHttp\Client|null  $guzzle
      * @return void
      */
-    public function __construct($apiKey = null, HttpClient $client = null)
+    public function __construct(
+    /**
+         * The Novu API Key.
+         *
+         * @var string
+         */
+        protected string $apiKey,
+
+        /**
+         * The Novu API Base URL.
+         *
+         * @var string
+         */
+        protected string $baseUri = 'https://api.novu.co/v1/',
+
+        /**
+         * The Guzzle HTTP Client instance.
+         *
+         * @var \GuzzleHttp\Client
+         */
+        public ?\GuzzleHttp\Client $client = null,
+
+        /**
+         * Number of seconds a request is retried.
+         *
+         * @var int
+         */
+        public int $timeout = 30,
+
+    )
     {
-        if ( is_null($apiKey)) {
-            throw IsNull::make('API KEY');
-        }
 
         if( empty($apiKey)) {
             throw isEmpty::make('API KEY');
         }
 
-        if (! is_null($apiKey)) {
-            $this->setApiKey($apiKey, $client);
-        }
-
-        if (! is_null($client)) {
-            $this->client = $client;
-        }
+        $this->setApiKey($apiKey, $client);
+        $this->client = $client;
     }
 
     /**
@@ -83,7 +78,7 @@ public function __construct($apiKey = null, HttpClient $client = null)
      * @param  \GuzzleHttp\Client|null  $client
      * @return $this
      */
-    public function setApiKey($apiKey, $client = null)
+    public function setApiKey($apiKey, $client = null): self
     {
         $this->apiKey = $apiKey;
 
@@ -106,7 +101,7 @@ public function setApiKey($apiKey, $client = null)
      * @param  int  $timeout
      * @return $this
      */
-    public function setTimeout($timeout)
+    public function setTimeout($timeout): self
     {
         $this->timeout = $timeout;
 
@@ -118,8 +113,18 @@ public function setTimeout($timeout)
      *
      * @return int
      */
-    public function getTimeout()
+    public function getTimeout(): int
     {
         return $this->timeout;
     }
+
+    /**
+     * Get the API Base Uri
+     *
+     * @return string
+     */
+    public function getBaseUri(): string
+    {
+        return $this->baseUri;
+    }
 }

src/Resources/Activity.php

@@ -4,34 +4,52 @@
 
 class Activity extends Resource
 {
+    public function __construct(
+        /**
+         * The internal id Novu generated for the activity graph stats.
+         *
+         * @var string
+         */
+        private readonly string $id,
+
+        /**
+         * The number of stats.
+         *
+         * @var int
+         */
+        private readonly int $count
+        ) {
+    }
+
     /**
-     * The internal id Novu generated for the activity graph stats.
+     * Gets the internal id Novu generated for the activity graph stats.
      *
-     * @var string
+     * @return string
      */
-    public $id;
+    public function getId(): string
+    {
+        return $this->id;
+    }
 
     /**
-     * The number of stats
+     * Gets number of stats.
      *
-     * @var int
+     * @return int
      */
-    public $count;
+    public function getCount(): int
+    {
+        return $this->count;
+    }
 
     /**
      * Return the array form of Activity object.
-     *
      * @return array
      */
     public function toArray(): array
     {
-        $publicProperties = get_object_vars($this);
-
-        unset($publicProperties['attributes']);
-        unset($publicProperties['novu']);
-
-        return array_filter($publicProperties, function ($value) { 
-            return null !== $value;
-        });
+        return [
+            'id'    => $this->id,
+            'count' => $this->count,
+        ];
     }
-}
+}