Removing Multibyte dependency from the core

cakephp · Sep 28, 2012 · 8735268 · 8735268
1 parent 29192ab
commit 8735268
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 30 deletions.
diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php
@@ -21,15 +21,11 @@
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\I18n\Multibyte;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 
-if (function_exists('mb_internal_encoding')) {
-	$encoding = Configure::read('App.encoding');
-	if (!empty($encoding)) {
-		mb_internal_encoding($encoding);
-	}
-}
+mb_internal_encoding(Configure::read('App.encoding'));
 
 /**
  * I18n handles translation of Text and time format strings.

diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php
@@ -439,10 +439,6 @@ public static function tail($text, $length = 100, $options = array()) {
 		$options = array_merge($default, $options);
 		extract($options);
 
-		if (!function_exists('mb_strlen')) {
-			class_exists('Cake\I18n\Multibyte');
-		}
-
 		if (mb_strlen($text) <= $length) {
 			return $text;
 		}
@@ -486,10 +482,6 @@ public static function truncate($text, $length = 100, $options = array()) {
 		$options = array_merge($default, $options);
 		extract($options);
 
-		if (!function_exists('mb_strlen')) {
-			class_exists('Multibyte');
-		}
-
 		if ($html) {
 			if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
 				return $text;

diff --git a/lib/Cake/Utility/Time.php b/lib/Cake/Utility/Time.php
@@ -20,7 +20,6 @@
 namespace Cake\Utility;
 
 use Cake\Core\Configure;
-use Cake\I18n\Multibyte;
 
 /**
  * Time Helper class for easy use of time data.
@@ -1040,15 +1039,8 @@ protected static function _strftime($format, $date) {
 		$format = strftime($format, $date);
 		$encoding = Configure::read('App.encoding');
 
-		if (!empty($encoding) && $encoding === 'UTF-8') {
-			if (function_exists('mb_check_encoding')) {
-				$valid = mb_check_encoding($format, $encoding);
-			} else {
-				$valid = !Multibyte::checkMultibyte($format);
-			}
-			if (!$valid) {
-				$format = utf8_encode($format);
-			}
+		if ($encoding === 'UTF-8' && !mb_check_encoding($format, $encoding)) {
+			$format = utf8_encode($format);
 		}
 		return $format;
 	}

diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php
@@ -21,11 +21,6 @@
 use Cake\Error\Exception;
 use Cake\Utility\File;
 
-// Load multibyte if the extension is missing.
-if (!function_exists('mb_strlen')) {
-	class_exists('Cake\I18n\Multibyte');
-}
-
 /**
  * Offers different validation methods.
  *

diff --git a/lib/Cake/View/Helper/TimeHelper.php b/lib/Cake/View/Helper/TimeHelper.php
@@ -21,7 +21,6 @@
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Error;
-use Cake\I18n\Multibyte;
 use Cake\Utility\Hash;
 use Cake\View\Helper;
 use Cake\View\View;