CS

asika32764 · asika32764 · commit 93ce8dfbd0c7 · 2018-07-09T00:19:13.000+08:00
diff --git a/Mbstring.php b/Mbstring.php
@@ -178,17 +178,20 @@ public static function strSplit($string, $length = 1, $encoding = null)
 
         if ($length === 1) {
             return preg_split("//u", $string, -1, PREG_SPLIT_NO_EMPTY);
-        } elseif ($length > 1) {
+        }
+
+        if ($length > 1) {
             $return_value = [];
             $string_length = static::strlen($string, $encoding);
+
             for ($i = 0; $i < $string_length; $i += $length) {
                 $return_value[] = static::substr($string, $i, $length, $encoding);
             }
 
             return $return_value;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -615,6 +618,7 @@ public static function isUtf8($str)
 
         for ($i = 0; $i < $len; $i++) {
             $in = ord($str{$i});
+
             if ($mState === 0) {
                 // When mState is zero we expect either a US-ASCII character or a
                 // multi-octet sequence.
diff --git a/StringHelper.php b/StringHelper.php
@@ -53,7 +53,7 @@ public static function isEmpty($string)
 
         $string = (string) $string;
 
-        return !(boolean) strlen($string);
+        return !(bool) strlen($string);
     }
 
     /**
@@ -117,7 +117,9 @@ public static function backquote($string)
      */
     public static function increment($string, $style = self::INCREMENT_STYLE_DEFAULT, $n = 0)
     {
-        $styleSpec = isset(self::$incrementStyles[$style]) ? self::$incrementStyles[$style] : self::$incrementStyles['default'];
+        $styleSpec = isset(self::$incrementStyles[$style])
+            ? self::$incrementStyles[$style]
+            : self::$incrementStyles['default'];
 
         // Regular expression search and replace patterns.
         if (is_array($styleSpec[0])) {
diff --git a/StringInflector.php b/StringInflector.php
@@ -325,7 +325,7 @@ public static function getInstance($new = false)
      */
     public function isCountable($word)
     {
-        return (boolean) in_array($word, $this->rules['countable']);
+        return in_array($word, $this->rules['countable'], true);
     }
 
     /**
diff --git a/Test/MbstringTest.php b/Test/MbstringTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Part of Windwalker project Test files.
+ * Part of Windwalker project Test files.  @codingStandardsIgnoreStart
  *
  * @copyright  Copyright (C) 2014 - 2015 LYRASOFT Taiwan, Inc. All rights reserved.
  * @license    GNU Lesser General Public License version 3 or later.
diff --git a/Test/SimpleTemplateTest.php b/Test/SimpleTemplateTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Part of Windwalker project Test files.
+ * Part of Windwalker project Test files.  @codingStandardsIgnoreStart
  *
  * @copyright  Copyright (C) 2011 - 2014 SMS Taiwan, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
diff --git a/Test/StringHelperTest.php b/Test/StringHelperTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Part of Windwalker project Test files.
+ * Part of Windwalker project Test files.  @codingStandardsIgnoreStart
  *
  * @copyright  Copyright (C) 2014 - 2015 LYRASOFT Taiwan, Inc. All rights reserved.
  * @license    GNU Lesser General Public License version 3 or later.
diff --git a/Test/Utf8StringTest.php b/Test/Utf8StringTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Part of Windwalker project Test files.
+ * Part of Windwalker project Test files.  @codingStandardsIgnoreStart
  *
  * @copyright  Copyright (C) 2014 - 2015 LYRASOFT Taiwan, Inc. All rights reserved.
  * @license    GNU Lesser General Public License version 3 or later.
diff --git a/Utf8String.php b/Utf8String.php
@@ -8,23 +8,8 @@
 
 namespace Windwalker\String;
 
-// PHP mbstring and iconv local configuration. Port from Joomla String.
-if (version_compare(PHP_VERSION, '5.6', '>=')) {
-    @ini_set('default_charset', 'UTF-8');
-} else {
-    // Check if mbstring extension is loaded and attempt to load it if not present except for windows
-    if (extension_loaded('mbstring')) {
-        @ini_set('mbstring.internal_encoding', 'UTF-8');
-        @ini_set('mbstring.http_input', 'UTF-8');
-        @ini_set('mbstring.http_output', 'UTF-8');
-    }
-    // Same for iconv
-    if (function_exists('iconv')) {
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('output_encoding', 'UTF-8');
-    }
-}
+@ini_set('default_charset', 'UTF-8');
+
 /**
  * Include the utf8 package
  */
diff --git a/phputf8/utils/ascii.php b/phputf8/utils/ascii.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Part of Windwalker project.
+ * Part of Windwalker project.  @codingStandardsIgnoreStart
  *
  * @copyright  Copyright (C) 2014 - 2015 LYRASOFT. All rights reserved.
  * @license    GNU Lesser General Public License version 3 or later.

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public static function getInstance($new = false)`
`325`	`325`	`*/`
`326`	`326`	`public function isCountable($word)`
`327`	`327`	`{`
`328`		`- return (boolean) in_array($word, $this->rules['countable']);`
	`328`	`+ return in_array($word, $this->rules['countable'], true);`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/**`
`3`		`- * Part of Windwalker project Test files.`
	`3`	`+ * Part of Windwalker project Test files. @codingStandardsIgnoreStart`
`4`	`4`	`*`
`5`	`5`	`* @copyright Copyright (C) 2014 - 2015 LYRASOFT Taiwan, Inc. All rights reserved.`
`6`	`6`	`* @license GNU Lesser General Public License version 3 or later.`