Update for L6

Author: gabsource

composer.json

@@ -3,17 +3,12 @@
     "description": "SDK for OVH SMS APIs",
     "license": "BSD-3-Clause",
     "require": {
-        "bnbwebexpertise/php-ovh": "~2.0.1"
+        "bnbwebexpertise/php-ovh": "^3.0"
     },
     "autoload": {
         "psr-0": {"Ovh\\Sms\\": "src/"},
         "psr-4": {"Ovh\\Sms\\": "src/"}
     },
-    "require-dev": {
-        "phpunit/phpunit": "7.*",
-        "phpdocumentor/phpdocumentor": "2.*",
-        "squizlabs/php_codesniffer": "3.*"
-    },
     "scripts": {
         "test": [
             "phpunit"

src/Message.php

@@ -156,7 +156,7 @@ public function send($message)
         $coding = ($this->is_gsm0338($message) ? '7bit' : '8bit');
 
         // Prepare request parameters
-        $parameters = (object) array('message' => $message, 'receivers' => $this->receivers, 'noStopClause' => !$this->isMarketing, 'differedPeriod' => $differedPeriod, 'coding' => $coding, 'tag' => $this->tag);
+        $parameters = (object) ['message' => $message, 'receivers' => $this->receivers, 'noStopClause' => !$this->isMarketing, 'differedPeriod' => $differedPeriod, 'coding' => $coding, 'tag' => $this->tag];
 
         // Manage sender
         if ($this->sender) {

src/Sms.php

@@ -144,7 +144,8 @@ class Sms
     public function __construct(
         $SmsApi,
         $type,
-        $id
+        $id,
+        $message = null
     ) {
         if (!isset($SmsApi)) {
             throw new \Ovh\Exceptions\InvalidParameterException("SmsApi parameter is empty");
@@ -162,6 +163,7 @@ public function __construct(
         $this->Sms              = $SmsApi;
         $this->type             = $type;
         $this->id               = $id;
+        $this->message          = $message;
     }
 
 
@@ -196,7 +198,7 @@ public function getCreationDateTime()
      */
     public function getDeliveryDetails()
     {
-        $details = $this->Sms->getConnection('/sms/ptts', (object) array("ptt" => $this->ptt));
+        $details = $this->Sms->getConnection()->get('/sms/ptts', (object) ["ptt" => $this->ptt]);
 
         return $details['comment'];
     }
@@ -242,7 +244,7 @@ public function getMessage()
      */
     public function getMessageLength()
     {
-        return count($this->message);
+        return strlen($this->message);
     }
 
 
@@ -330,7 +332,7 @@ public function load()
         $this->sendDateTime     = null;
         $this->tag              = $messageDetails['tag'];
 
-        if (in_array($this->type, array('planned', 'outgoing'))) {
+        if (in_array($this->type, ['planned', 'outgoing'])) {
             $this->ptt              = $messageDetails['ptt'];
             $this->deliveryReceipt  = $messageDetails['deliveryReceipt'];
             $this->sendDateTime     = $this->creationDateTime;

src/SmsApi.php

@@ -61,7 +61,7 @@ class SmsApi
      */
     private $account = null;
 
-     /**
+    /**
      * User
      *
      * @var string
@@ -117,7 +117,7 @@ public function addSender($sender, $reason, $description = "")
             throw new \Ovh\Exceptions\InvalidParameterException("Reason parameter is empty");
         }
 
-        $parameters = (object) array("sender" => $sender, "reason" => $reason, "description" => $description);
+        $parameters = (object) ["sender" => $sender, "reason" => $reason, "description" => $description];
 
         return $this->conn->post("/sms/".$this->account."/senders", $parameters);
     }
@@ -337,7 +337,7 @@ public function getIncomingMessages($startDateTime = null, $endDateTime = null,
         }
 
         // Check and prepare parameters
-        $parameters = array();
+        $parameters = [];
 
         if (!is_null($startDateTime)) {
             if (!is_a($startDateTime, "DateTime")) {
@@ -368,7 +368,7 @@ public function getIncomingMessages($startDateTime = null, $endDateTime = null,
         $messages = $this->conn->get($this->getUri() . "incoming", (object) $parameters);
 
         foreach ($messages as $id => $message) {
-            $messages[$id] = new Sms($this, "incoming", $message);
+            $messages[$id] = new Sms($this, "incoming", $id, $message);
         }
 
         return $messages;
@@ -388,7 +388,7 @@ public function getIncomingMessages($startDateTime = null, $endDateTime = null,
      * @throws \GuzzleHttp\Exception\ClientException     if http request returns an error
      * @throws \Ovh\Exceptions\InvalidParameterException if account is not set or parameters are invalid
      */
-    public function getOutgoingMessages($dateStart = null, $dateEnd = null, $sender = null, $receiver = null, $tag = null)
+    public function getOutgoingMessages($startDateTime = null, $endDateTime = null, $sender = null, $receiver = null, $tag = null)
     {
         if (is_null($this->account)) {
             throw new \Ovh\Exceptions\InvalidParameterException("Please set account before using this function");
@@ -425,7 +425,7 @@ public function getOutgoingMessages($dateStart = null, $dateEnd = null, $sender
         $messages = $this->conn->get($this->getUri() . "outgoing", (object) $parameters);
 
         foreach ($messages as $id => $message) {
-            $messages[$id] = new Sms($this, "outgoing", $message);
+            $messages[$id] = new Sms($this, "outgoing", $id, $message);
         }
 
         return $messages;
@@ -449,7 +449,7 @@ public function getOutgoingMessage($id)
         // Get messages
         $message = $this->conn->get($this->getUri() . "outgoing/" . $id);
 
-        return new Sms($this, "outgoing", $message);
+        return new Sms($this, "outgoing", $id, $message);
     }
 
     /**
@@ -469,7 +469,7 @@ public function getPlannedMessages()
         $messages = $this->conn->get($this->getUri() . "jobs");
 
         foreach ($messages as $id => $message) {
-            $messages[$id] = new Sms($this, "jobs", $message);
+            $messages[$id] = new Sms($this, "jobs", $id, $message);
         }
 
         return $messages;
@@ -504,7 +504,7 @@ public function getPrice($country, $countryCurrency, $quantity)
             throw new \Ovh\Exceptions\InvalidParameterException("Quantity parameter is empty");
         }
 
-        $parameters = array("countryDestination" => $country, "countryCurrencyPrice" => $countryCurrency, "quantity" => $quantity);
+        $parameters = ["countryDestination" => $country, "countryCurrencyPrice" => $countryCurrency, "quantity" => $quantity];
 
         return $this->conn->get("/sms/".$this->account."/seeOffers", (object) $parameters);
     }