Merge pull request #7 from ksimka/fix_strlen

Replace `strlen` with `mb_strlen`, require `mbstring`.
tgallice · May 24, 2016 · 4628305 · 4628305
2 parents b2c4023 + 7fadb09
commit 4628305
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
   },
   "require": {
     "php": ">=5.5.9",
+    "ext-mbstring": "*",
     "guzzlehttp/guzzle": "^6.2"
   },
   "require-dev": {

diff --git a/src/Message/Message.php b/src/Message/Message.php
@@ -34,7 +34,7 @@ public function __construct($recipientId, $messageData, $notificationType = Noti
     {
         $this->recipient = $recipientId;
 
-        if (is_string($messageData) && strlen($messageData) > 320) {
+        if (is_string($messageData) && mb_strlen($messageData) > 320) {
             throw new \InvalidArgumentException('The text message should not exceed 320 characters');
         }
 

diff --git a/src/Model/Button.php b/src/Model/Button.php
@@ -41,7 +41,7 @@ public function getTitle()
      */
     protected function validateTitleSize($title)
     {
-        if (strlen($title) > 20) {
+        if (mb_strlen($title) > 20) {
             throw new \InvalidArgumentException('A call to action title field should not exceed 20 characters');
         }
     }

diff --git a/src/Model/Generic/Element.php b/src/Model/Generic/Element.php
@@ -105,11 +105,11 @@ public function jsonSerialize()
 
     private function validateElement()
     {
-        if (strlen($this->title) > 45) {
+        if (mb_strlen($this->title) > 45) {
             throw new \InvalidArgumentException('In a generic element, the "title" field should not exceed 45 characters');
         }
 
-        if (!empty($this->subtitle) && strlen($this->subtitle) > 80) {
+        if (!empty($this->subtitle) && mb_strlen($this->subtitle) > 80) {
             throw new \InvalidArgumentException('In a generic element, the "subtitle" field should not exceed 80 characters');
         }