Replace String class by JString. Fixes #42

Author: vierbergenlars

src/vierbergenlars/LibJs/JSArray.php

@@ -78,12 +78,12 @@ public function JSforEach(\Closure $func)
 
     /**
      *
-     * @param String $c
-     * @return String
+     * @param JString $c
+     * @return JString
      */
     public function join($c)
     {
-        return new String(implode($c, $this->array));
+        return new JString(implode($c, $this->array));
     }
 
     /**
@@ -201,4 +201,4 @@ public function valueOf()
     {
         return $this->array;
     }
-}
+}

src/vierbergenlars/LibJs/String.php renamed to src/vierbergenlars/LibJs/JString.php

@@ -26,7 +26,7 @@
 
 namespace vierbergenlars\LibJs;
 
-class String extends Object implements \ArrayAccess
+class JString extends Object implements \ArrayAccess
 {
     /**
      * Wrapped string
@@ -69,7 +69,7 @@ public function charCodeAt($pos)
 
     /**
      *
-     * @return String
+     * @return JString
      */
     public function concat()
     {
@@ -101,15 +101,15 @@ public function match($regex)
      *
      * @param RegExp|string $regexOrSubstr
      * @param \Closure|string $newSubstrOrFunction
-     * @return String
+     * @return JString
      */
     public function replace($regexOrSubstr, $newSubstrOrFunction)
     {
         if($regexOrSubstr instanceof RegExp) {
             if($newSubstrOrFunction instanceof \Closure) {
                 $wrap = function($matches)use($newSubstrOrFunction) {
                     $matches = array_map(function($s) {
-                        return new String($s);
+                        return new JString($s);
                     }, $matches);
                     return call_user_func_array($newSubstrOrFunction, $matches);
                 };
@@ -132,7 +132,7 @@ public function replace($regexOrSubstr, $newSubstrOrFunction)
 
     /**
      *
-     * @param string|String|RegExp $c
+     * @param string|JString|RegExp $c
      * @return JSArray
      */
     public function split($c)
@@ -147,7 +147,7 @@ public function split($c)
 
     /**
      *
-     * @return String
+     * @return JString
      */
     public function toLowerCase()
     {
@@ -156,7 +156,7 @@ public function toLowerCase()
 
     /**
      *
-     * @return String
+     * @return JString
      */
     public function toString()
     {
@@ -165,7 +165,7 @@ public function toString()
 
     /**
      *
-     * @return String
+     * @return JString
      */
     public function toUpperCase()
     {
@@ -174,7 +174,7 @@ public function toUpperCase()
 
     /**
      *
-     * @return String
+     * @return JString
      */
     public function trim()
     {
@@ -227,4 +227,4 @@ public function offsetUnset($offset)
         throw new \LogicException('Cannot unset a position in a string');
     }
 
-}
+}

src/vierbergenlars/LibJs/Object.php

@@ -31,13 +31,13 @@ class Object
     /**
      *
      * @param type $something
-     * @return \vierbergenlars\LibJs\String|\vierbergenlars\LibJs\JSArray
+     * @return \vierbergenlars\LibJs\JString|\vierbergenlars\LibJs\JSArray
      * @private
      */
     public function _convert($something)
     {
         if(is_string($something)) {
-            return new String($something);
+            return new JString($something);
         } elseif(is_array($something)) {
             return new JSArray($something);
         } else {
@@ -47,11 +47,11 @@ public function _convert($something)
 
     public function toString()
     {
-        return new String((string)$this);
+        return new JString((string)$this);
     }
 
     public function valueOf()
     {
         return (string)$this;
     }
-}
+}

src/vierbergenlars/LibJs/RegExp.php

@@ -62,7 +62,7 @@ public function __construct($regex, $flags = '')
 
     /**
      *
-     * @param string|String $str
+     * @param string|JString $str
      */
     public function exec($str)
     {
@@ -78,7 +78,7 @@ public function exec($str)
 
     /**
      *
-     * @param string|String $str
+     * @param string|JString $str
      */
     public function test($str)
     {

src/vierbergenlars/LibJs/Util.php

@@ -36,11 +36,11 @@ private function __construct()
     public static function JSor()
     {
         foreach(func_get_args() as $arg) {
-            if($arg instanceof String)
+            if($arg instanceof JString)
                 $arg = $arg->valueOf();
             if($arg)
                 return $arg;
         }
         return 0;
     }
-}
+}