Merge pull request #8 from seven-io/dev

Dev

Author: matthiez

.idea/php-client.iml

@@ -1,59 +1,60 @@
 {
-    "authors": [
-        {
-            "email": "[email protected]",
-            "homepage": "https://www.seven.io",
-            "name": "seven communications GmbH & Co. KG",
-            "role": "Developer"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "Seven\\Api\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Seven\\Tests\\": "tests/"
-        }
-    },
-    "config": {
-        "platform": {
-            "php": "7.4"
-        }
-    },
-    "description": "Official API Client for requesting the seven.io SMS Gateway.",
-    "homepage": "https://github.com/seven-io/php-client",
-    "keywords": [
-        "2fa",
-        "cnam",
-        "gateway",
-        "hlr",
-        "mnp",
-        "sms",
-        "text2speech",
-        "tts"
-    ],
-    "license": "MIT",
-    "name": "seven.io/api",
-    "require": {
-        "php": ">=7.4",
-        "ext-ctype": "*",
-        "ext-curl": "*",
-        "ext-mbstring": "*",
-        "ext-json": "*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^9",
-        "ext-xdebug": "*",
-        "ext-soap": "*",
-        "ext-simplexml": "*"
-    },
-    "support": {
-        "docs": "https://github.com/seven-io/php-client",
-        "email": "[email protected]",
-        "rss": "https://www.seven.io/en/feed/",
-        "source": "https://github.com/seven-io/php-client"
-    },
-    "type": "library"
+  "authors": [
+    {
+      "email": "[email protected]",
+      "homepage": "https://www.seven.io",
+      "name": "seven communications GmbH & Co. KG",
+      "role": "Developer"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Seven\\Api\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Seven\\Tests\\": "tests/"
+    }
+  },
+  "config": {
+    "platform": {
+      "php": "8.2"
+    }
+  },
+  "description": "Official API Client for requesting the seven.io messaging Gateway.",
+  "homepage": "https://github.com/seven-io/php-client",
+  "keywords": [
+    "2fa",
+    "cnam",
+    "gateway",
+    "hlr",
+    "mnp",
+    "rcs",
+    "sms",
+    "text2speech",
+    "tts"
+  ],
+  "license": "MIT",
+  "name": "seven.io/api",
+  "require": {
+    "php": ">=8.2",
+    "ext-ctype": "*",
+    "ext-curl": "*",
+    "ext-mbstring": "*",
+    "ext-json": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^11",
+    "ext-xdebug": "*",
+    "ext-soap": "*",
+    "ext-simplexml": "*"
+  },
+  "support": {
+    "docs": "https://github.com/seven-io/php-client",
+    "email": "[email protected]",
+    "rss": "https://www.seven.io/en/feed/",
+    "source": "https://github.com/seven-io/php-client"
+  },
+  "type": "library"
 }

.idea/php-test-framework.xml

@@ -7,18 +7,18 @@
 use Seven\Api\Constant\HttpMethod;
 use UnexpectedValueException;
 
-abstract class BaseClient {
+abstract class BaseClient
+{
     public const BASE_URI = 'https://gateway.seven.io/api';
 
-    protected string $apiKey;
-    protected string $sentWith;
-
     /**
      * @throws Exception
      */
-    public function __construct(string $apiKey, string $sentWith = 'php-api') {
-        $this->apiKey = $apiKey;
-        $this->sentWith = $sentWith;
+    public function __construct(
+        protected string $apiKey,
+        protected string $sentWith = 'php-api'
+    )
+    {
 
         if ('' === $apiKey) throw new InvalidArgumentException(
             "Invalid required constructor argument apiKey: $apiKey");
@@ -27,25 +27,23 @@ public function __construct(string $apiKey, string $sentWith = 'php-api') {
             "Invalid required constructor argument sentWith: $sentWith");
     }
 
-    public function getApiKey(): string {
+    public function getApiKey(): string
+    {
         return $this->apiKey;
     }
 
-    public function getSentWith(): string {
+    public function getSentWith(): string
+    {
         return $this->sentWith;
     }
 
-    /**
-     * @return mixed
-     */
-    public function delete(string $path, array $options = []) {
+    public function delete(string $path, array $options = []): mixed
+    {
         return $this->request($path, HttpMethod::DELETE, $options);
     }
 
-    /**
-     * @return mixed
-     */
-    protected function request(string $path, string $method, array $options = []) {
+    protected function request(string $path, string $method, array $options = []): mixed
+    {
         $method = strtoupper($method);
         $methods = HttpMethod::values();
         if (!in_array($method, $methods)) {
@@ -58,16 +56,17 @@ protected function request(string $path, string $method, array $options = []) {
         $headers = [
             'Accept: application/json',
             'Content-Type: application/json',
-            "SentWith: $this->sentWith",
-            "X-Api-Key: $this->apiKey",
+            'SentWith: ' . $this->sentWith,
+            'X-Api-Key:' . $this->apiKey,
         ];
-        $url = self::BASE_URI . "/$path";
+        $url = self::BASE_URI . '/' . $path;
         $params = http_build_query($options);
-        if (HttpMethod::GET === $method) $url .= "?$params";
+        if (HttpMethod::GET === $method) $url .= '?' . $params;
 
         $ch = curl_init($url);
 
         if (HttpMethod::POST === $method) {
+            var_dump($options);
             $params = stripslashes(json_encode($options, JSON_UNESCAPED_UNICODE));
 
             curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
@@ -88,23 +87,19 @@ protected function request(string $path, string $method, array $options = []) {
 
         try {
             $res = json_decode($res, false, 512, JSON_THROW_ON_ERROR);
-        } catch (Exception $e) {
+        } catch (Exception) {
         }
 
         return $res;
     }
 
-    /**
-     * @return mixed
-     */
-    public function post(string $path, array $options = []) {
+    public function post(string $path, array $options = []): mixed
+    {
         return $this->request($path, HttpMethod::POST, $options);
     }
 
-    /**
-     * @return mixed
-     */
-    public function get(string $path, array $options = []) {
+    public function get(string $path, array $options = []): mixed
+    {
         return $this->request($path, HttpMethod::GET, $options);
     }
 }

.idea/php.xml

@@ -9,27 +9,31 @@
 use Seven\Api\Resource\JournalResource;
 use Seven\Api\Resource\LookupResource;
 use Seven\Api\Resource\PricingResource;
+use Seven\Api\Resource\RcsResource;
 use Seven\Api\Resource\SmsResource;
 use Seven\Api\Resource\StatusResource;
 use Seven\Api\Resource\SubaccountsResource;
 use Seven\Api\Resource\ValidateForVoiceResource;
 use Seven\Api\Resource\VoiceResource;
 
-class Client extends BaseClient {
+class Client extends BaseClient
+{
     public AnalyticsResource $analytics;
     public BalanceResource $balance;
     public ContactsResource $contacts;
     public HooksResource $hooks;
     public JournalResource $journal;
     public LookupResource $lookup;
     public PricingResource $pricing;
+    public RcsResource $rcs;
     public SmsResource $sms;
     public StatusResource $status;
     public SubaccountsResource $subaccounts;
     public ValidateForVoiceResource $validateForVoice;
     public VoiceResource $voice;
 
-    public function __construct(string $apiKey, string $sentWith = 'php-api') {
+    public function __construct(string $apiKey, string $sentWith = 'php-api')
+    {
         parent::__construct($apiKey, $sentWith);
 
         $this->analytics = new AnalyticsResource($this);
@@ -39,6 +43,7 @@ public function __construct(string $apiKey, string $sentWith = 'php-api') {
         $this->journal = new JournalResource($this);
         $this->lookup = new LookupResource($this);
         $this->pricing = new PricingResource($this);
+        $this->rcs = new RcsResource($this);
         $this->sms = new SmsResource($this);
         $this->status = new StatusResource($this);
         $this->subaccounts = new SubaccountsResource($this);

composer.json

@@ -0,0 +1,9 @@
+<?php
+
+namespace Seven\Api\Params\Rcs;
+
+enum RcsEvent
+{
+    case IS_TYPING;
+    case READ;
+}