Merge pull request #13 from nguyenanhung/v3.1.14-develop

Optimize for PHP mbstring

Author: hungnguyenhp

composer.json

@@ -21,7 +21,8 @@
 		"php": ">=5.6",
 		"ext-json": "*",
 		"ext-mbstring": "*",
-		"nguyenanhung/codeigniter-basic-helper": ">=1.0"
+		"nguyenanhung/codeigniter-basic-helper": ">=1.0",
+		"symfony/polyfill-mbstring": ">=1.0"
 	},
 	"require-dev": {
 		"nguyenanhung/my-debug": "^4.0 || ^3.0 || ^2.0 || ^1.0"
@@ -35,7 +36,8 @@
 			"nguyenanhung\\CodeIgniter\\BaseREST\\": "thirdParty/REST/"
 		},
 		"files": [
-			"helpers/codeigniter_modular.php"
+			"helpers/codeigniter_modular.php",
+			"helpers/common.php"
 		]
 	},
 	"suggest": {

custom/HungNG_CI_Base_Controller_Filename_Checker.php

@@ -86,7 +86,7 @@ private function checkFilename($filepath, $dir)
 				$prefix = config_item('subclass_prefix');
 
 				if ($this->hasPrefix($filename, $prefix)) {
-					$filename = substr($filename, strlen($prefix));
+					$filename = substr($filename, bear_str_length($prefix));
 				}
 			}
 
@@ -115,7 +115,7 @@ private function checkUcFirst($filename)
 
 		private function hasPrefix($filename, $prefix)
 		{
-			if (strncmp($prefix, $filename, strlen($prefix)) === 0) {
+			if (strncmp($prefix, $filename, bear_str_length($prefix)) === 0) {
 				return true;
 			}
 

helpers/common.php

@@ -0,0 +1,31 @@
+<?php
+if (!function_exists('bear_str_to_lower')) {
+	function bear_str_to_lower($str)
+	{
+		if (function_exists('mb_strtolower')) {
+			return mb_strtolower($str, 'UTF-8');
+		}
+
+		return strtolower($str);
+	}
+}
+if (!function_exists('bear_str_to_upper')) {
+	function bear_str_to_upper($str)
+	{
+		if (function_exists('mb_strtoupper')) {
+			return mb_strtoupper($str, 'UTF-8');
+		}
+
+		return strtoupper($str);
+	}
+}
+if (!function_exists('bear_str_length')) {
+	function bear_str_length($str)
+	{
+		if (function_exists('mb_strlen')) {
+			return mb_strlen($str);
+		}
+
+		return strlen($str);
+	}
+}

hungng/HungNG_CI_Base_Controllers.php

@@ -318,7 +318,7 @@ protected function log($name = '', $message = '', $context = array(), $inputLeve
 		{
 			try {
 				if (class_exists('Monolog\Logger') && class_exists('Monolog\Formatter\LineFormatter') && class_exists('Monolog\Handler\StreamHandler')) {
-					$useLevel = strtolower($inputLevel);
+					$useLevel = bear_str_to_lower($inputLevel);
 					switch ($useLevel) {
 						case 'debug':
 							$keyLevel = Monolog\Logger::DEBUG;

hungng/HungNG_CI_Base_Lib_Hmvc_Migration.php

@@ -279,7 +279,7 @@ public function version($target_version)
 
 				// Filename validations
 				if (preg_match('/^\d{3}_(\w+)$/', $name, $match)) {
-					$match[1] = strtolower($match[1]);
+					$match[1] = bear_str_to_lower($match[1]);
 
 					// Cannot repeat a migration at different steps
 					if (in_array($match[1], $migrations)) {
@@ -325,7 +325,9 @@ public function version($target_version)
 			// Loop through the migrations
 			foreach ($migrations as $migration) {
 				// Run the migration class
-				$class = 'Migration_' . ucfirst(strtolower($migration));
+
+				$class = 'Migration_' . ucfirst(bear_str_to_lower($migration));
+
 				call_user_func(array(new $class, $method));
 
 				$current_version += $step;

hungng/HungNG_CI_Base_Lib_MongoDB.php

@@ -1445,7 +1445,7 @@ public function aggregate($collection, $operation)
 		public function order_by($fields = array())
 		{
 			foreach ($fields as $col => $val) {
-				if ($val == -1 || $val === false || strtolower($val) == 'desc') {
+				if ($val == -1 || $val === false || bear_str_to_lower($val) == 'desc') {
 					$this->sorts[$col] = -1;
 				} else {
 					$this->sorts[$col] = 1;
@@ -1603,7 +1603,7 @@ public function add_index($collection = "", $keys = array(), $options = array())
 			}
 
 			foreach ($keys as $col => $val) {
-				if ($val == -1 || $val === false || strtolower($val) == 'desc') {
+				if ($val == -1 || $val === false || bear_str_to_lower($val) == 'desc') {
 					$keys[$col] = -1;
 				} else {
 					$keys[$col] = 1;

hungng/HungNG_CI_Base_Module.php

@@ -318,7 +318,7 @@ protected function log($name = '', $message = '', $context = array(), $inputLeve
 		{
 			try {
 				if (class_exists('Monolog\Logger') && class_exists('Monolog\Formatter\LineFormatter') && class_exists('Monolog\Handler\StreamHandler')) {
-					$useLevel = strtolower($inputLevel);
+					$useLevel = bear_str_to_lower($inputLevel);
 					switch ($useLevel) {
 						case 'debug':
 							$keyLevel = Monolog\Logger::DEBUG;