Merge pull request #5 from wild-r/master

allow double quotes in string
divoxx · Feb 18, 2015 · 39cab77 · 39cab77
2 parents d6ad748 + 99f9bb1
commit 39cab77
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/php_serialization/tokenizer.rb b/lib/php_serialization/tokenizer.rb
@@ -8,13 +8,13 @@ def each
       while !@string.empty?
         token = case @string
         when /\A-?[0-9]+(\.[0-9]+)?/m then yield([:NUMBER, $&])
-        when /\A"([^"]*)"/m         then yield([:STRING, $1])
+        when /\A"((?:(?:"(?![;:]))*|(?:[^"]))*)"(?=[:;])/m then yield([:STRING, $1])
         when /\A[^\s]/m             then yield([$&, $&])
         end
-        
+
         @string = $'
       end
-      
+
       yield([false, '$'])
     end
   end

diff --git a/spec/unserialization_spec.rb b/spec/unserialization_spec.rb
@@ -48,4 +48,13 @@ class Person
     person.name.should == "Rodrigo"
     person.age.should == 23
   end
+
+  it "should unserialize a string with double quotes" do
+    PhpSerialization.load('s:12:"new "Year"";').should == "new \"Year\""
+  end
+
+  it "should unserialize a string with double quotes in the middle" do
+    PhpSerialization.load("a:3:{i:0;s:4:\"test\";i:1;s:27:\"string with \"quotes\" inside\";s:2:\"in\";s:15:\"middle of array\";}").should == {0 => 'test',1 => 'string with "quotes" inside', 'in' => 'middle of array'}
+  end
+
 end