Updating to PHP 8 (#13)

General update brings the plugin inline with PHP 8

Author: cheesegrits

README.md

@@ -200,5 +200,5 @@ In Ubuntu 16.04, install it like so :
 
 In Ubuntu 18.04, install it like so :
 
-    sudo apt install php7.2-curl
+    sudo apt install php8.3-curl
 

composer.json

@@ -9,11 +9,11 @@
         "homepage": "https://github.com/adilbaig"
     }],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=8.0",
         "ext-curl": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=5.6"
+        "phpunit/phpunit": ">=12.0"
     },
     "autoload": {
         "psr-0": {

src/PagerDuty/AcknowledgeEvent.php

@@ -10,7 +10,7 @@
 class AcknowledgeEvent extends Event
 {
 
-    public function __construct($routingKey, $dedupKey)
+    public function __construct(string $routingKey, string $dedupKey)
     {
         parent::__construct($routingKey, 'acknowledge');
 

src/PagerDuty/Event.php

@@ -2,28 +2,31 @@
 
 namespace PagerDuty;
 
+use ArrayAccess;
+use Exception;
+use JsonSerializable;
 use PagerDuty\Exceptions\PagerDutyException;
 
 /**
  * An abstract Event
  *
  * @author adil
  */
-abstract class Event implements \ArrayAccess, \JsonSerializable
+abstract class Event implements ArrayAccess, JsonSerializable
 {
 
-    protected $dict;
+    protected array $dict = [];
 
     /**
      * ctor
      *
-     * @param string $routingKey
-     * @param string $type - One of 'trigger', 'acknowledge' or 'resolve'
+     * @param  string  $routingKey
+     * @param  string  $type - One of 'trigger', 'acknowledge' or 'resolve'
      */
-    protected function __construct($routingKey, $type)
+    protected function __construct(string $routingKey, string $type)
     {
-        $this->dict['routing_key'] = (string) $routingKey;
-        $this->dict['event_action'] = (string) $type;
+        $this->dict['routing_key'] = $routingKey;
+        $this->dict['event_action'] = $type;
     }
 
     /**
@@ -36,40 +39,41 @@ protected function __construct($routingKey, $type)
      *
      * @link https://v2.developer.pagerduty.com/docs/events-api-v2#alert-de-duplication
      *
-     * @param string $key
+     * @param  string  $key
      *
      * @return self
      */
-    public function setDeDupKey($key)
+    public function setDeDupKey(string $key): static
     {
-        $this->dict['dedup_key'] = substr((string) $key, 0, 255);
+        $this->dict['dedup_key'] = substr($key, 0, 255);
         return $this;
     }
 
     /**
-     * Get the request json as an array
+     * Get the request JSON as an array
      * Useful for debugging or logging.
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
-        return $this->dict;
+        return $this->dict ?? [];
     }
 
     /**
      * Send the event to PagerDuty
      *
-     * @param array $result (Opt)(Pass by reference) - If this parameter is given the result of the CURL call will be filled here. The response is an associative array.
-     *
-     * @throws PagerDutyException - If status code == 400
+     * @param array|null  $result (Opt) (Pass by reference) - If this parameter is given, the result of the CURL call will be filled here. The response is an associative array.
      *
      * @return int - HTTP response code
      *  202 - Event Processed
      *  400 - Invalid Event. Throws a PagerDutyException
      *  403 - Rate Limited. Slow down and try again later.
+     * 
+     * @throws PagerDutyException - If status code == 400
+     * @noinspection PhpUnused
      */
-    public function send(&$result = null)
+    public function send(?array &$result = null): int
     {
         $jsonStr = json_encode($this);
 
@@ -93,40 +97,44 @@ public function send(&$result = null)
 
         return $responseCode;
     }
+    
     /* -------- ArrayAccess -------- */
 
-    public function offsetExists($key)
+    public function offsetExists(mixed $offset): bool
     {
-        return array_key_exists($key, $this->dict);
+        return array_key_exists($offset, $this->dict);
     }
 
-    public function offsetGet($key)
+    public function offsetGet(mixed $offset): mixed
     {
-        if (!$this->offsetExists($key)) {
-            return;
+        if (!$this->offsetExists($offset)) {
+            return null;
         }
 
-        return $this->dict[$key];
+        return $this->dict[$offset];
     }
 
-    public function offsetSet($key, $value)
+    /**
+     * @throws Exception
+     */
+    public function offsetSet(mixed $offset, mixed $value): void
     {
-        if (empty($key) || is_string($key)) {
-            throw new \Exception("Key must be a non-empty string. It is `" . var_export($key, true) . "`");
+        if (empty($offset) || is_string($offset)) {
+            throw new Exception("Offset must be a non-empty string. It is `" . var_export($offset, true) . "`");
         }
 
-        $this->dict[$key] = $value;
+        $this->dict[$offset] = $value;
     }
 
-    public function offsetUnset($key)
+    public function offsetUnset(mixed $offset): void
     {
-        if ($this->offsetExists($key)) {
-            unset($this->dict[$key]);
+        if ($this->offsetExists($offset)) {
+            unset($this->dict[$offset]);
         }
     }
     /* -------- JsonSerializable -------- */
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->toArray();
     }

src/PagerDuty/Exceptions/PagerDutyConfigurationException.php

@@ -2,11 +2,13 @@
 
 namespace PagerDuty\Exceptions;
 
+use Exception;
+
 /**
  * Class PagerDutyConfigurationException
  * @package PagerDuty\Exceptions
  */
-class PagerDutyConfigurationException extends \Exception
+class PagerDutyConfigurationException extends Exception
 {
 
 }

src/PagerDuty/Exceptions/PagerDutyException.php

@@ -2,15 +2,17 @@
 
 namespace PagerDuty\Exceptions;
 
+use Exception;
+
 /**
  * PagerDutyException
  *
  * @author adil
  */
-class PagerDutyException extends \Exception
+class PagerDutyException extends Exception
 {
 
-    protected $errors;
+    protected array $errors;
 
     public function __construct($message, array $errors)
     {
@@ -21,8 +23,9 @@ public function __construct($message, array $errors)
     /**
      * 
      * @return array
+     * @noinspection PhpUnused
      */
-    public function getErrors()
+    public function getErrors(): array
     {
         return $this->errors;
     }