Merge pull request #15 from messagebird/ca-cert-usage

Use ca-bundle when doing a cURL request to the REST API

Author: samwierema

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "messagebird/php-rest-api",
     "description": "MessageBird REST API client for PHP",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "type": "library",
     "homepage": "https://github.com/messagebird/php-rest-api",
     "license": "BSD-2-Clause",

examples/message-create-unicode.php

@@ -0,0 +1,27 @@
+<?php
+
+require_once(__DIR__ . '/../autoload.php');
+
+$MessageBird = new \MessageBird\Client('YOUR_ACCESS_KEY'); // Set your own API access key here.
+
+$Message             = new \MessageBird\Objects\Message();
+$Message->originator = 'MessageBird';
+$Message->recipients = array(31612345678);
+$Message->body       = 'This is a test message with a smiling emoji 😀.';
+$Message->datacoding = 'unicode';
+
+try {
+    $MessageResult = $MessageBird->messages->create($Message);
+    var_dump($MessageResult);
+
+} catch (\MessageBird\Exceptions\AuthenticateException $e) {
+    // That means that your accessKey is unknown
+    echo 'wrong login';
+
+} catch (\MessageBird\Exceptions\BalanceException $e) {
+    // That means that you are out of credits, so do something about it.
+    echo 'no balance';
+
+} catch (\Exception $e) {
+    echo $e->getMessage();
+}

examples/message-create.php

@@ -7,7 +7,7 @@
 $Message             = new \MessageBird\Objects\Message();
 $Message->originator = 'MessageBird';
 $Message->recipients = array(31612345678);
-$Message->body = 'This is a test message.';
+$Message->body       = 'This is a test message.';
 
 try {
     $MessageResult = $MessageBird->messages->create($Message);

src/MessageBird/Client.php

@@ -12,7 +12,7 @@ class Client
 
     const ENDPOINT = 'https://rest.messagebird.com';
 
-    const CLIENT_VERSION = '1.3.0';
+    const CLIENT_VERSION = '1.3.1';
 
     /**
      * @var string
@@ -59,9 +59,9 @@ class Client
      */
     protected $HttpClient;
 
-
     /**
-     * @param $accessKey
+     * @param string            $accessKey
+     * @param Common\HttpClient $httpClient
      */
     public function __construct($accessKey = null, Common\HttpClient $httpClient = null)
     {
@@ -95,6 +95,9 @@ public function setAccessKey ($accessKey)
         $this->HttpClient->setAuthentication($Authentication);
     }
 
+    /**
+     * @return string
+     */
     private function getPhpVersion()
     {
         if (!defined('PHP_VERSION_ID')) {

src/MessageBird/Common/HttpClient.php

@@ -19,7 +19,7 @@ class HttpClient
     const HTTP_NO_CONTENT = 204;
 
     /**
-     * @var
+     * @var string
      */
     protected $endpoint;
 
@@ -34,7 +34,7 @@ class HttpClient
     protected $Authentication;
 
     /**
-     * @param $endpoint
+     * @param string $endpoint
      */
     public function __construct($endpoint)
     {
@@ -112,6 +112,13 @@ public function performHttpRequest($method, $resourceName, $query = null, $body
             curl_setopt($curl, CURLOPT_CUSTOMREQUEST, self::REQUEST_DELETE);
         }
 
+        // Some servers have outdated or incorrect certificates, Use the included CA-bundle
+        $caFile = realpath(dirname(__FILE__) . "/../ca-bundle.crt");
+        if (!file_exists($caFile)) {
+            throw new Exceptions\HttpException('Unable to find CA-bundle file: ' . $caFile);
+        }
+        curl_setopt($curl, CURLOPT_CAINFO, $caFile);
+
         $response = curl_exec($curl);
 
         if ($response === false) {