Merge pull request #84 from os-cillation/master

String Values had no quotes

Author: TobiasHauck

Tests/Types/ValueTest.php

@@ -42,6 +42,14 @@ public function create() {
         $this->assertSame(1.01, Value::create('1.01'));
         $this->assertSame('hello', Value::create('hello'));
         $this->assertSame('hello', Value::create('"hello"'));
+        $this->assertSame('hello', Value::create('\'hello\''));
+        $this->assertSame('hello', Value::create('`hello`'));
+        $this->assertSame('\'hello"', Value::create('\'hello"'));
+
+        $encoded = '{"test":true}';
+
+        $this->assertSame($encoded, Value::create("\"{$encoded}\""));
+        $this->assertSame($encoded, Value::create("{$encoded}"));
 
         $this->assertSame(true, Value::create('true'));
         $this->assertSame(false, Value::create('false'));

Types/Value.php

@@ -45,7 +45,7 @@ public static function create($value) {
         if($value === 'false') return false;
         if($value === 'null')  return null;
 
-        $unquoted = preg_replace('/\"|\\\'|\`$/', '', preg_replace('/^\"|\\\'|\`/', '', $value));
+        $unquoted = preg_replace('/^(?|\"(.*)\"|\\\'(.*)\\\'|\`(.*)\`)$/', '$1', $value);
         if (!is_numeric($unquoted))                   return $unquoted;
         if ((string) intval($unquoted) === $unquoted) return intval($unquoted);