Use multi-bytes functions

Author: kylekatarnls

src/JsPhpize/Compiler/Compiler.php

@@ -167,7 +167,7 @@ function ($pair) use ($visitNode, $indent) {
     protected function visitConstant(Constant $constant)
     {
         $value = $constant->value;
-        if ($constant->type === 'string' && substr($constant->value, 0, 1) === '"') {
+        if ($constant->type === 'string' && mb_substr($constant->value, 0, 1) === '"') {
             $value = str_replace('$', '\\$', $value);
         }
 

src/JsPhpize/JsPhpize.php

@@ -72,7 +72,7 @@ public function compile($input, $filename = null)
             $php = preg_replace('/\)[\s;]*$/', '', $php);
         }
 
-        if (substr(ltrim($end), 0, 1) === '{') {
+        if (mb_substr(ltrim($end), 0, 1) === '{') {
             $php = preg_replace('/\s*\{\s*\}\s*$/', '', $php);
         }
 
@@ -185,8 +185,8 @@ public function render($input, $filename = null, array $variables = array())
             throw $e;
         } catch (\Exception $e) {
             $summary = $input;
-            if (strlen($summary) > 50) {
-                $summary = substr($summary, 0, 47) . '...';
+            if (mb_strlen($summary) > 50) {
+                $summary = mb_substr($summary, 0, 47) . '...';
             }
 
             throw new Exception("An error occur in [$summary]:\n" . $e->getMessage(), 2, E_ERROR, __FILE__, __LINE__, $e);

src/JsPhpize/Lexer/Lexer.php

@@ -63,10 +63,10 @@ public function exceptionInfos()
 
     protected function consume($consumed)
     {
-        $consumed = is_int($consumed) ? substr($this->input, 0, $consumed) : $consumed;
-        $this->consumed = strlen(trim($consumed)) > 1 ? $consumed : $this->consumed . $consumed;
-        $this->line += substr_count($consumed, "\n");
-        $this->input = substr($this->input, strlen($consumed));
+        $consumed = is_int($consumed) ? mb_substr($this->input, 0, $consumed) : $consumed;
+        $this->consumed = mb_strlen(trim($consumed)) > 1 ? $consumed : $this->consumed . $consumed;
+        $this->line += mb_substr_count($consumed, "\n");
+        $this->input = mb_substr($this->input, mb_strlen($consumed));
     }
 
     protected function token($type, $data = array())
@@ -107,7 +107,7 @@ protected function scan($pattern, $method)
      */
     public function next()
     {
-        if (!strlen($this->input)) {
+        if (!mb_strlen($this->input)) {
             return false;
         }
 
@@ -126,6 +126,6 @@ public function next()
             }
         }
 
-        throw new Exception('Unknow pattern found at: ' . substr($this->input, 0, 100), 12);
+        throw new Exception('Unknow pattern found at: ' . mb_substr($this->input, 0, 100), 12);
     }
 }

src/JsPhpize/Lexer/Scanner.php

@@ -20,7 +20,7 @@ public function scanConstant($matches)
     {
         $constant = trim($matches[0]);
         $constPrefix = $this->engine->getOption('constPrefix', JsPhpize::CONST_PREFIX);
-        if (strpos($constant, $constPrefix) === 0) {
+        if (mb_strpos($constant, $constPrefix) === 0) {
             throw new Exception('Constants cannot start with ' . $constPrefix . ', this prefix is reserved for JsPhpize' . $this->exceptionInfos(), 1);
         }
 
@@ -32,8 +32,8 @@ public function scanConstant($matches)
 
         if (isset($translate[$constant])) {
             $constant = $translate[$constant];
-        } elseif (substr($matches[0], 0, 5) === 'Math.') {
-            $constant = 'M_' . substr($constant, 5);
+        } elseif (mb_substr($matches[0], 0, 5) === 'Math.') {
+            $constant = 'M_' . mb_substr($constant, 5);
         }
 
         $this->consume($matches[0]);
@@ -69,12 +69,12 @@ public function scanOperator($matches)
     public function scanVariable($matches)
     {
         $varPrefix = $this->engine->getOption('varPrefix', JsPhpize::VAR_PREFIX);
-        if (strpos($matches[1], $varPrefix) === 0) {
+        if (mb_strpos($matches[1], $varPrefix) === 0) {
             throw new Exception('Variables cannot start with ' . $varPrefix . ', this prefix is reserved for JsPhpize' . $this->exceptionInfos(), 4);
         }
 
-        if ($this->engine->getOption('ignoreDollarVariable') && substr($matches[0], 0, 1) === '$') {
-            $matches[0] = ' ' . substr($matches[0], 1);
+        if ($this->engine->getOption('ignoreDollarVariable') && mb_substr($matches[0], 0, 1) === '$') {
+            $matches[0] = ' ' . mb_substr($matches[0], 1);
         }
 
         return $this->valueToken('variable', $matches);

src/JsPhpize/Lexer/Token.php

@@ -80,7 +80,7 @@ public function isLeftHandOperator()
 
     public function isAssignation()
     {
-        return substr($this->type, -1) === '=' && !$this->isComparison();
+        return mb_substr($this->type, -1) === '=' && !$this->isComparison();
     }
 
     public function isOperator()

src/JsPhpize/Nodes/Constant.php

@@ -33,7 +33,7 @@ public function getNonAssignableReason()
         if (in_array($this->value, array('NAN', 'INF'))) {
             return "{$this->value} is not assignable.";
         }
-        if (substr($this->value, 0, 2) === 'M_') {
+        if (mb_substr($this->value, 0, 2) === 'M_') {
             return "'M_' prefix is reserved to mathematical constants.";
         }
 

src/JsPhpize/Stream/ExpressionStream.php

@@ -26,7 +26,7 @@ class ExpressionStream
      */
     public function stream_open($path)
     {
-        $this->data = substr(strstr($path, ';'), 1);
+        $this->data = mb_substr(mb_strstr($path, ';'), 1);
 
         return true;
     }
@@ -45,8 +45,8 @@ public function stream_stat()
      */
     public function stream_read($count)
     {
-        $ret = substr($this->data, $this->position, $count);
-        $this->position += strlen($ret);
+        $ret = mb_substr($this->data, $this->position, $count);
+        $this->position += mb_strlen($ret);
 
         return $ret;
     }
@@ -64,7 +64,7 @@ public function stream_tell()
      */
     public function stream_eof()
     {
-        return $this->position >= strlen($this->data);
+        return $this->position >= mb_strlen($this->data);
     }
 
     /**
@@ -74,6 +74,6 @@ public function stream_eof()
      */
     public function url_stat($path, $flags)
     {
-        return array(0, 0, 0, 0, 0, 0, 0, strlen($this->data), 0, 0, 0, 0);
+        return array(0, 0, 0, 0, 0, 0, 0, mb_strlen($this->data), 0, 0, 0, 0);
     }
 }