Merge branch 'release/1.1.0'

Author: Pallieter Verhpeven

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [1.1.0] - 2017-09-21
+### Added
+- add custom grouping support 
+
 ## [1.0.2] - 2017-06-29
 ### Fixed
 - tests
@@ -36,7 +40,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - initial code
 
-[Unreleased]: https://github.com/CMTelecom/messaging-php/compare/1.0.2....HEAD
+[Unreleased]: https://github.com/CMTelecom/messaging-php/compare/1.1.0....HEAD
+[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
 [1.0.0]: https://github.com/CMTelecom/messaging-php/compare/0.0.1...1.0.0

README.md

@@ -63,7 +63,7 @@ use \CM\Messaging\Settings\AllowedChannel;
 
  $message = (new \CM\Messaging\Message())
         ->setFrom('Your name/company name')
-        ->setTo([['0031612345678', '0031623456789', '0031634567890'])
+        ->setTo(['0031612345678', '0031623456789', '0031634567890'])
         ->setBody('Message')
         ->setReference('Your message')
         ->setAllowedChannels([AllowedChannel::SMS, AllowedChannel::PUSH, AllowedChannel::VOICE])
@@ -207,6 +207,12 @@ Exception thrown | Description
 **setDcs()** | int $dcs | $this 
 **getReference()** |  | string 
 **setReference()** | string $reference | $this 
+**getCustomGrouping1()** |  | string 
+**setCustomGrouping1()** | string $reference | $this 
+**getCustomGrouping2()** |  | string 
+**setCustomGrouping2()** | string $reference | $this 
+**getCustomGrouping3()** |  | string 
+**setCustomGrouping3()** | string $reference | $this 
 **getMinimumNumberOfMessageParts()** |  | int 
 **setMinimumNumberOfMessageParts()** | int $minimumNumberOfMessageParts | $this 
 **getMaximumNumberOfMessageParts()** |  | int 
@@ -230,6 +236,12 @@ Exception thrown | Description
 **setDcs()** | int $dcs | $this 
 **getReference()** |  | string 
 **setReference()** | string $reference | $this 
+**getCustomGrouping1()** |  | string 
+**setCustomGrouping1()** | string $reference | $this 
+**getCustomGrouping2()** |  | string 
+**setCustomGrouping2()** | string $reference | $this 
+**getCustomGrouping3()** |  | string 
+**setCustomGrouping3()** | string $reference | $this 
 **getMinimumNumberOfMessageParts()** |  | int 
 **setMinimumNumberOfMessageParts()** | int $minimumNumberOfMessageParts | $this 
 **getMaximumNumberOfMessageParts()** |  | int 

composer.json

@@ -2,7 +2,14 @@
   "name": "cmtelecom/messaging-php",
   "description": "PHP client for integration with the CM platform",
   "keywords": [
-    "cmtelecom", "cm", "telecom", "sms", "api", "sdk", "library", "package"
+    "cmtelecom",
+    "cm",
+    "telecom",
+    "sms",
+    "api",
+    "sdk",
+    "library",
+    "package"
   ],
   "homepage": "https://www.cmtelecom.com",
   "license": "Apache 2.0",
@@ -19,19 +26,22 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "myclabs/php-enum": "^1.5",
-    "php-http/httplug": "^1.1",
-    "guzzlehttp/psr7": "^1.0"
+    "myclabs/php-enum": "1.5.*",
+    "php-http/httplug": "1.1.*",
+    "guzzlehttp/psr7": "1.4.*"
   },
   "require-dev": {
-    "php-http/mock-client": "^0.3",
-    "fzaninotto/faker": "^1.6",
-    "phpunit/phpunit": "^4.0"
+    "php-http/mock-client": "0.3.*",
+    "fzaninotto/faker": "1.6.*",
+    "phpunit/phpunit": "4.*"
   },
   "autoload": {
     "psr-4": {
       "CM\\Messaging\\": "src/CM/Messaging//",
       "Test\\CM\\Messaging\\": "tests/CM/Messaging//"
     }
+  },
+  "suggest": {
+    "php-http/guzzle6-adapter": "This is the default and recommended http client adapter. A http client adapter is required!"
   }
 }