bahricanli / laravel-emoji

src/LaravelEmoji.php

Doc Comments +3 added lines

@@ -40,6 +40,9 @@
  	   return mb_convert_encoding('&#' . intval($u) . ';', 'UTF-8', 'HTML-ENTITIES');
 	}
 
+	/**
+	 * @param string $data
+	 */
 	static private function uniChrCode($data) {
 	   list(, $ord) = unpack('N', mb_convert_encoding($data, 'UCS-4BE', 'UTF-8'));
 	   return $ord;

Indentation +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 
 	static public function covertEmojiToName($data) {
 		$data = emoji_docomo_to_unified($data);   # DoCoMo devices
-	    	$data = emoji_kddi_to_unified($data);     # KDDI & Au devices
-    		$data = emoji_softbank_to_unified($data); # Softbank & (iPhone) Apple devices
-	    	$data = emoji_google_to_unified($data);   # Google Android devices
+			$data = emoji_kddi_to_unified($data);     # KDDI & Au devices
+			$data = emoji_softbank_to_unified($data); # Softbank & (iPhone) Apple devices
+			$data = emoji_google_to_unified($data);   # Google Android devices
 		$data = emoji_unified_to_name($data);
 		$data = emoji_unified_to_key($data);
 		return $data;

Spacing +11 added lines, -11 removed lines

@@ -7,10 +7,10 @@ 
 class LaravelEmoji extends Controller {
 
 	static public function covertEmojiToName($data) {
-		$data = emoji_docomo_to_unified($data);   # DoCoMo devices
-	    	$data = emoji_kddi_to_unified($data);     # KDDI & Au devices
+		$data = emoji_docomo_to_unified($data); # DoCoMo devices
+	    	$data = emoji_kddi_to_unified($data); # KDDI & Au devices
     		$data = emoji_softbank_to_unified($data); # Softbank & (iPhone) Apple devices
-	    	$data = emoji_google_to_unified($data);   # Google Android devices
+	    	$data = emoji_google_to_unified($data); # Google Android devices
 		$data = emoji_unified_to_name($data);
 		$data = emoji_unified_to_key($data);
 		return $data;
@@ -46,7 +46,7 @@ 
 	}
 
 	static public function textWithEmoji($data) {
-		if($data=="") return false;
+		if ($data == "") return false;
 
 		$data = LaravelEmoji::covertEmojiToName($data);
 		$data = LaravelEmoji::covertNameToEmoji($data);
@@ -56,11 +56,11 @@ 
 		$n = 0;
 
 		$strLen = mb_strlen($data, 'UTF-8');
-		for($i=0; $i<$strLen; $i++) {
+		for ($i = 0; $i < $strLen; $i++) {
 			$char = mb_substr($data, $i, 1, 'UTF-8');
 			$charCode = LaravelEmoji::uniChrCode($char);
 
-			if($charCode>1000) {
+			if ($charCode > 1000) {
 				
 				/*if ( $charCode < 0 || $charCode > 0xFFFF ) {
 					$CPString .= 'Error1 ' . strtolower(dechex($charCode)) . '!';
@@ -68,22 +68,22 @@ 
 
 
 				if ($haut != 0) {
-					if (0xDC00 <= $charCode&& $charCode<= 0xDFFF) {
-						$CPString .= ' imgFront'. strtolower(dechex(0x10000 + (($haut - 0xD800) << 10) + ($charCode  - 0xDC00))) . 'imgBack ';
+					if (0xDC00 <= $charCode && $charCode <= 0xDFFF) {
+						$CPString .= ' imgFront' . strtolower(dechex(0x10000 + (($haut - 0xD800) << 10) + ($charCode - 0xDC00))) . 'imgBack ';
 						$haut = 0;
 						continue;
 					}
 					else {
-						$CPString .=  'Error2' . strtolower(dechex($haut)) . '!';
+						$CPString .= 'Error2' . strtolower(dechex($haut)) . '!';
 						$haut = 0;
 					}
 				}
 
-				if (0xD800 <= $charCode  && $charCode <= 0xDBFF) {
+				if (0xD800 <= $charCode && $charCode <= 0xDBFF) {
 					$haut = $charCode;
 				}
 				else {
-					$CPString .= ' imgFront'. strtolower(dechex($charCode)) . 'imgBack ';
+					$CPString .= ' imgFront' . strtolower(dechex($charCode)) . 'imgBack ';
 				}
 			}
 			else {

Braces +6 added lines, -7 removed lines

@@ -46,7 +46,9 @@ 
 	}
 
 	static public function textWithEmoji($data) {
-		if($data=="") return false;
+		if($data=="") {
+			return false;
+		}
 
 		$data = LaravelEmoji::covertEmojiToName($data);
 		$data = LaravelEmoji::covertNameToEmoji($data);
@@ -72,8 +74,7 @@ 
 						$CPString .= ' imgFront'. strtolower(dechex(0x10000 + (($haut - 0xD800) << 10) + ($charCode  - 0xDC00))) . 'imgBack ';
 						$haut = 0;
 						continue;
-					}
-					else {
+					} else {
 						$CPString .=  'Error2' . strtolower(dechex($haut)) . '!';
 						$haut = 0;
 					}
@@ -81,12 +82,10 @@ 
 
 				if (0xD800 <= $charCode  && $charCode <= 0xDBFF) {
 					$haut = $charCode;
-				}
-				else {
+				} else {
 					$CPString .= ' imgFront'. strtolower(dechex($charCode)) . 'imgBack ';
 				}
-			}
-			else {
+			} else {
 				$CPString .= LaravelEmoji::uniChr($charCode);
 			}
 		}

src/LaravelEmojiServiceProvider.php

Indentation +17 added lines, -17 removed lines

@@ -6,23 +6,23 @@
 
 class LaravelEmojiServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
+	/**
+	 * Bootstrap the application services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
 	//
-    }
+	}
 
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+	/**
+	 * Register the application services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
 }

src/Emoji.php

Spacing +12 added lines, -12 removed lines

@@ -9901,31 +9901,31 @@
 	# functions to convert incoming data into the unified format
 	#
 
-	function emoji_docomo_to_unified(	$text){ return emoji_convert($text, 'docomo_to_unified'); }
-	function emoji_kddi_to_unified(		$text){ return emoji_convert($text, 'kddi_to_unified'); }
-	function emoji_softbank_to_unified(	$text){ return emoji_convert($text, 'softbank_to_unified'); }
-	function emoji_google_to_unified(	$text){ return emoji_convert($text, 'google_to_unified'); }
+	function emoji_docomo_to_unified($text) { return emoji_convert($text, 'docomo_to_unified'); }
+	function emoji_kddi_to_unified($text) { return emoji_convert($text, 'kddi_to_unified'); }
+	function emoji_softbank_to_unified($text) { return emoji_convert($text, 'softbank_to_unified'); }
+	function emoji_google_to_unified($text) { return emoji_convert($text, 'google_to_unified'); }
 
 
 	#
 	# functions to convert unified data into an outgoing format
 	#
 
-	function emoji_unified_to_docomo(	$text){ return emoji_convert($text, 'unified_to_docomo'); }
-	function emoji_unified_to_kddi(		$text){ return emoji_convert($text, 'unified_to_kddi'); }
-	function emoji_unified_to_softbank(	$text){ return emoji_convert($text, 'unified_to_softbank'); }
-	function emoji_unified_to_google(	$text){ return emoji_convert($text, 'unified_to_google'); }
-	function emoji_unified_to_html(		$text){ return emoji_convert($text, 'unified_to_html'); }
-	function emoji_html_to_unified(		$text){ return emoji_convert($text, 'html_to_unified'); }
+	function emoji_unified_to_docomo($text) { return emoji_convert($text, 'unified_to_docomo'); }
+	function emoji_unified_to_kddi($text) { return emoji_convert($text, 'unified_to_kddi'); }
+	function emoji_unified_to_softbank($text) { return emoji_convert($text, 'unified_to_softbank'); }
+	function emoji_unified_to_google($text) { return emoji_convert($text, 'unified_to_google'); }
+	function emoji_unified_to_html($text) { return emoji_convert($text, 'unified_to_html'); }
+	function emoji_html_to_unified($text) { return emoji_convert($text, 'html_to_unified'); }
 
 
 
-	function emoji_convert($text, $map){
+	function emoji_convert($text, $map) {
 
 		return str_replace(array_keys($GLOBALS['emoji_maps'][$map]), $GLOBALS['emoji_maps'][$map], $text);
 	}
 
-	function emoji_get_name($unified_cp){
+	function emoji_get_name($unified_cp) {
 
 		return $GLOBALS['emoji_maps']['names'][$unified_cp] ? $GLOBALS['emoji_maps']['names'][$unified_cp] : '?';
 	}