Update String to Text.

src/Model/Behavior/BitmaskedBehavior.php

@@ -6,7 +6,7 @@ use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\Utility\Inflector;
-use Cake\Utility\String;
+use Cake\Utility\Text;
 
 /**
  * BitmaskedBehavior
@@ -260,7 +260,7 @@ class BitmaskedBehavior extends Behavior {
 
 		$field = $this->_config['field'];
 		$contain = $contain ? ' & ? = ?' : ' & ? != ?';
-		$contain = String::insert($contain, array($bitmask, $bitmask));
+		$contain = Text::insert($contain, array($bitmask, $bitmask));
 		return array('(' . $this->_table->alias() . '.' . $field . $contain . ')');
 	}
 

src/Model/Behavior/JsonableBehavior.php

@@ -5,7 +5,7 @@ use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
-use Cake\Utility\String;
+use Cake\Utility\Text;
 
 /**
  * A behavior that will json_encode (and json_decode) fields if they contain an array or specific pattern.
@@ -229,9 +229,9 @@ class JsonableBehavior extends Behavior {
 		$separator = $this->_config['separator'];
 
 		$res = array();
-		$pieces = String::tokenize($val, $separator, $leftBound, $rightBound);
+		$pieces = Text::tokenize($val, $separator, $leftBound, $rightBound);
 		foreach ($pieces as $piece) {
-			$subpieces = String::tokenize($piece, $this->_config['keyValueSeparator'], $leftBound, $rightBound);
+			$subpieces = Text::tokenize($piece, $this->_config['keyValueSeparator'], $leftBound, $rightBound);
 			if (count($subpieces) < 2) {
 				continue;
 			}
@@ -250,7 +250,7 @@ class JsonableBehavior extends Behavior {
 	public function _fromList($val) {
 		extract($this->_config);
 
-		return String::tokenize($val, $separator, $leftBound, $rightBound);
+		return Text::tokenize($val, $separator, $leftBound, $rightBound);
 	}
 
 	/**

src/Network/Email/Email.php

@@ -3,7 +3,7 @@ namespace Tools\Network\Email;
 
 use Cake\Core\Configure;
 use Cake\Network\Email\Email as CakeEmail;
-use Cake\Utility\String;
+use Cake\Utility\Text;
 use InvalidArgumentException;
 use Tools\Utility\Mime;
 
@@ -231,7 +231,7 @@ class Email extends CakeEmail {
 		if (empty($options['mimetype'])) {
 			$options['mimetype'] = $this->_getMime($file);
 		}
-		$options['contentId'] = $contentId ? $contentId : str_replace('-', '', String::uuid()) . '@' . $this->_domain;
+		$options['contentId'] = $contentId ? $contentId : str_replace('-', '', Text::uuid()) . '@' . $this->_domain;
 		$file = array($name => $options);
 		$res = $this->addAttachments($file);
 		if ($contentId === null) {
@@ -260,7 +260,7 @@ class Email extends CakeEmail {
 		}
 		$options['data'] = $content;
 		$options['mimetype'] = $mimeType;
-		$options['contentId'] = $contentId ? $contentId : str_replace('-', '', String::uuid()) . '@' . $this->_domain;
+		$options['contentId'] = $contentId ? $contentId : str_replace('-', '', Text::uuid()) . '@' . $this->_domain;
 		$file = array($filename => $options);
 		$res = $this->addAttachments($file);
 		if ($contentId === null) {

src/Utility/Text.php

@@ -2,7 +2,7 @@
 namespace Tools\Utility;
 
 use Cake\Core\Configure;
-use Cake\Utility\String;
+use Cake\Utility\Text;
 
 /**
  * Extend String.