Merge pull request #6 from CMTelecom/develop

Develop

Author: PallieterVerhoeven

CHANGELOG.md

@@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Removed
+- removed default channel selection
+- removed obsolete test assertions 
+- removed config file
+
+### Fixed
+- fixed body type php doc accept string parameters
+
+### Updated
+- updated line formatting
+- updated imports
+
 ## [1.1.1] - 2017-10-30
 ### Changed
 - change custom grouping fields to private for constancy
@@ -45,7 +57,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - initial code
 
 [Unreleased]: https://github.com/CMTelecom/messaging-php/compare/1.1.1....HEAD
-[1.1.0]: https://github.com/CMTelecom/messaging-php/compare/1.1.0...1.1.1
+[1.1.1]: https://github.com/CMTelecom/messaging-php/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/CMTelecom/messaging-php/compare/1.0.2...1.1.0
 [1.0.2]: https://github.com/CMTelecom/messaging-php/compare/1.0.1...1.0.2
 [1.0.1]: https://github.com/CMTelecom/messaging-php/compare/1.0.0...1.0.1

README.md

@@ -128,23 +128,15 @@ try {
 
     // returns true if all messages are accepted
     $result->isAccepted() 
-    // returns true if messages with these phone numbers are accepted
-    $result->isAccepted(['0031612345678', '0031623456789'])
 
     // returns true if all messages are failed
     $result->isFailed()
-    // returns true if messages with these phone numbers are failed
-    $result->isFailed(['0031612345678', '0031623456789'])
 
     // returns an array with the accepted message responses
     $result->getAccepted() 
-    // returns an array with the accepted message responses containging these phone numbers
-    $result->getAccepted(['0031612345678', '0031623456789'])
 
     // returns an array with the failed message responses 
     $result->getFailed()
-    // returns an array with the failed message responses containging these phone numbers
-    $result->getFailed(['0031612345678', '0031623456789'])
 
 } catch (\CM\Messaging\Exception\BadRequestException $e) {
     // The request failed because of an invalid value, all messages has not been send

composer.lock

@@ -3,8 +3,8 @@
 namespace CM\Messaging;
 
 use CM\Messaging\Exception\InvalidAllowedChannelException;
-use CM\Messaging\Exception\InvalidStrategyException;
 use CM\Messaging\Exception\InvalidConfigurationException;
+use CM\Messaging\Exception\InvalidStrategyException;
 use CM\Messaging\Http\ApiHttpClient;
 use CM\Messaging\Request\Messages;
 use CM\Messaging\Request\Messages\Msg;
@@ -26,54 +26,48 @@
 class Client
 {
 
-    /**
-     * It possible to let our gateway do the encoding detection for you. In case it detects characters that are not part of the GSM character set, the message will be delivered as Unicode.
-     * Any existing DCS value will be ignored. If the message contains more than 70 characters in Unicode format it will be split into a multipart message.
-     *
-     * @var BodyType
-     */
-    private $bodyType;
-
-    /**
-     * You use the DCS (data coding scheme) parameter to indicate the type of message you are sending. If you set DCS to '0' or do not include the parameter, the messages uses standard GSM encoding.
-     * If DCS is set to '8' the message will be encoded using Unicode UCS2.
-     *
-     * @var int
-     */
-    private $dcs;
-
-    /**
-     * Here you can include your message reference. This information will be returned in a status report so you can match the message and it's status. It should be included in the XML when posting.
-     * Restrictions: 1 - 32 alphanumeric characters and reference will not work for demo accounts.
-     *
-     * @var string
-     */
-    private $reference;
-
     /**
      * Applying custom grouping names to messages helps filter your messages. With up to three levels of custom grouping fields that can be set, subsets of messages can be further broken down.
      * The custom grouping name can be up to 100 characters of your choosing. It’s recommended to limit the number of unique custom groupings to 1000.
      *
      * @var string
      */
     protected $customGrouping1;
-
     /**
      * Applying custom grouping names to messages helps filter your messages. With up to three levels of custom grouping fields that can be set, subsets of messages can be further broken down.
      * The custom grouping name can be up to 100 characters of your choosing. It’s recommended to limit the number of unique custom groupings to 1000.
      *
      * @var string
      */
     protected $customGrouping2;
-
     /**
      * Applying custom grouping names to messages helps filter your messages. With up to three levels of custom grouping fields that can be set, subsets of messages can be further broken down.
      * The custom grouping name can be up to 100 characters of your choosing. It’s recommended to limit the number of unique custom groupings to 1000.
      *
      * @var string
      */
     protected $customGrouping3;
-
+    /**
+     * It possible to let our gateway do the encoding detection for you. In case it detects characters that are not part of the GSM character set, the message will be delivered as Unicode.
+     * Any existing DCS value will be ignored. If the message contains more than 70 characters in Unicode format it will be split into a multipart message.
+     *
+     * @var BodyType
+     */
+    private $bodyType;
+    /**
+     * You use the DCS (data coding scheme) parameter to indicate the type of message you are sending. If you set DCS to '0' or do not include the parameter, the messages uses standard GSM encoding.
+     * If DCS is set to '8' the message will be encoded using Unicode UCS2.
+     *
+     * @var int
+     */
+    private $dcs;
+    /**
+     * Here you can include your message reference. This information will be returned in a status report so you can match the message and it's status. It should be included in the XML when posting.
+     * Restrictions: 1 - 32 alphanumeric characters and reference will not work for demo accounts.
+     *
+     * @var string
+     */
+    private $reference;
     /**
      * Used when sending multipart or concatenated SMS messages and always used together. Indicate the minimum and maximum of message parts that you allow the gateway to send for this message.
      * Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters.
@@ -103,7 +97,7 @@ class Client
      *
      * @var array[AllowedChannel]
      */
-    private $allowedChannels = [AllowedChannel::SMS];
+    private $allowedChannels;
 
     /**
      * Product token to authorize with.
@@ -145,6 +139,7 @@ public function __construct(HttpClient $httpClient, $productToken)
      * @param array         $parameters
      *
      * @return Response\Response
+     * @throws \Http\Client\Exception\HttpException
      * @throws \CM\Messaging\Exception\BadRequestException
      * @throws \RuntimeException
      * @throws \Http\Client\Exception
@@ -217,7 +212,7 @@ public function getBodyType()
     }
 
     /**
-     * @param BodyType $bodyType
+     * @param null|string|BodyType $bodyType
      *
      * @return $this
      */
@@ -403,7 +398,7 @@ public function getAllowedChannels()
     }
 
     /**
-     * @param array|AllowedChannel $allowedChannels
+     * @param array|string|AllowedChannel $allowedChannels
      *
      * @return $this
      */

src/CM/Messaging/Client.php

@@ -2,7 +2,6 @@
 
 namespace CM\Messaging\Http;
 
-use CM\Messaging\Config;
 use CM\Messaging\Exception\BadRequestException;
 use CM\Messaging\Response\Response;
 use GuzzleHttp\Psr7\Request;
@@ -50,8 +49,6 @@ private function buildHeader()
     {
         return [
             'Content-Type' => 'application/json',
-            'LANGUAGE'     => Config::LANGUAGE,
-            'SDK_VERSION'  => Config::SDK_VERSION,
             'HTTP_CLIENT'  => get_class($this->httpClient)
         ];
     }

src/CM/Messaging/Config.php

@@ -168,8 +168,8 @@ public function getBody()
     }
 
     /**
-     * @param string        $body
-     * @param null|BodyType $type
+     * @param string               $body
+     * @param null|string|BodyType $type
      *
      * @return $this
      */
@@ -366,7 +366,7 @@ public function getAllowedChannels()
     }
 
     /**
-     * @param array|AllowedChannel $allowedChannels
+     * @param array|string|AllowedChannel $allowedChannels
      *
      * @return $this
      */