Found a fix for some characters stopping deserialization

dbould · dbould · commit 80bd2ab39849 · 2017-02-19T18:56:07.000Z
from working by base64 encoding the seralized data.  Switched
comments test back to use this.
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -14,9 +14,3 @@ function getExpectedValue($path, $filename, $unserialize = true) {
 	$content = file_get_contents(dirname(__FILE__) . "/expected/" . array_pop($path) . "/" . $filename);
 	return ($unserialize ? unserialize($content) : $content);
 }
-
-function getExpectedValueFromPhpFile($path, $filename) {
-    $path = explode(DIRECTORY_SEPARATOR, $path);
-    return include(dirname(__FILE__) . "/expected/" . array_pop($path) . "/" . $filename);
-}
-?>
diff --git a/tests/cases/parser/commentsTest.php b/tests/cases/parser/commentsTest.php
@@ -32,7 +32,10 @@ public function testComments2() {
                         b 
                     FROM test';
             $p = $this->parser->parse($sql);
-            $expected = getExpectedValueFromPhpFile(dirname(__FILE__), 'comment2.php');
+            $expectedEncoded = getExpectedValue(dirname(__FILE__), 'comment2.serialized', false);
+            $expectedSerialized = base64_decode($expectedEncoded);
+            $expected = unserialize($expectedSerialized);
+
             $this->assertEquals($expected, $p, 'multi line comment');
         }
 
diff --git a/tests/expected/parser/comment2.php b/tests/expected/parser/comment2.php
diff --git a/tests/expected/parser/comment2.serialized b/tests/expected/parser/comment2.serialized
@@ -0,0 +1 @@
+YToyOntzOjY6IlNFTEVDVCI7YTozOntpOjA7YTo2OntzOjk6ImV4cHJfdHlwZSI7czo2OiJjb2xyZWYiO3M6NToiYWxpYXMiO2I6MDtzOjk6ImJhc2VfZXhwciI7czoxOiJhIjtzOjk6Im5vX3F1b3RlcyI7YToyOntzOjU6ImRlbGltIjtiOjA7czo1OiJwYXJ0cyI7YToxOntpOjA7czoxOiJhIjt9fXM6ODoic3ViX3RyZWUiO2I6MDtzOjU6ImRlbGltIjtzOjE6IiwiO31pOjE7YToyOntzOjk6ImV4cHJfdHlwZSI7czo3OiJjb21tZW50IjtzOjU6InZhbHVlIjtzOjEwNjoiLyogCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBtdWx0aSBsaW5lIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tbWVudAogICAgICAgICAgICAgICAgICAgICAgICAqLyI7fWk6MjthOjY6e3M6OToiZXhwcl90eXBlIjtzOjY6ImNvbHJlZiI7czo1OiJhbGlhcyI7YjowO3M6OToiYmFzZV9leHByIjtzOjE6ImIiO3M6OToibm9fcXVvdGVzIjthOjI6e3M6NToiZGVsaW0iO2I6MDtzOjU6InBhcnRzIjthOjE6e2k6MDtzOjE6ImIiO319czo4OiJzdWJfdHJlZSI7YjowO3M6NToiZGVsaW0iO2I6MDt9fXM6NDoiRlJPTSI7YToxOntpOjA7YToxMDp7czo5OiJleHByX3R5cGUiO3M6NToidGFibGUiO3M6NToidGFibGUiO3M6NDoidGVzdCI7czo5OiJub19xdW90ZXMiO2E6Mjp7czo1OiJkZWxpbSI7YjowO3M6NToicGFydHMiO2E6MTp7aTowO3M6NDoidGVzdCI7fX1zOjU6ImFsaWFzIjtiOjA7czo1OiJoaW50cyI7YjowO3M6OToiam9pbl90eXBlIjtzOjQ6IkpPSU4iO3M6ODoicmVmX3R5cGUiO2I6MDtzOjEwOiJyZWZfY2xhdXNlIjtiOjA7czo5OiJiYXNlX2V4cHIiO3M6NDoidGVzdCI7czo4OiJzdWJfdHJlZSI7YjowO319fQ==

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,10 @@ public function testComments2() {`
`32`	`32`	`b`
`33`	`33`	`FROM test';`
`34`	`34`	`$p = $this->parser->parse($sql);`
`35`		`- $expected = getExpectedValueFromPhpFile(dirname(__FILE__), 'comment2.php');`
	`35`	`+ $expectedEncoded = getExpectedValue(dirname(__FILE__), 'comment2.serialized', false);`
	`36`	`+ $expectedSerialized = base64_decode($expectedEncoded);`
	`37`	`+ $expected = unserialize($expectedSerialized);`
	`38`	`+`
`36`	`39`	`$this->assertEquals($expected, $p, 'multi line comment');`
`37`	`40`	`}`
`38`	`41`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+YToyOntzOjY6IlNFTEVDVCI7YTozOntpOjA7YTo2OntzOjk6ImV4cHJfdHlwZSI7czo2OiJjb2xyZWYiO3M6NToiYWxpYXMiO2I6MDtzOjk6ImJhc2VfZXhwciI7czoxOiJhIjtzOjk6Im5vX3F1b3RlcyI7YToyOntzOjU6ImRlbGltIjtiOjA7czo1OiJwYXJ0cyI7YToxOntpOjA7czoxOiJhIjt9fXM6ODoic3ViX3RyZWUiO2I6MDtzOjU6ImRlbGltIjtzOjE6IiwiO31pOjE7YToyOntzOjk6ImV4cHJfdHlwZSI7czo3OiJjb21tZW50IjtzOjU6InZhbHVlIjtzOjEwNjoiLyogCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBtdWx0aSBsaW5lIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tbWVudAogICAgICAgICAgICAgICAgICAgICAgICAqLyI7fWk6MjthOjY6e3M6OToiZXhwcl90eXBlIjtzOjY6ImNvbHJlZiI7czo1OiJhbGlhcyI7YjowO3M6OToiYmFzZV9leHByIjtzOjE6ImIiO3M6OToibm9fcXVvdGVzIjthOjI6e3M6NToiZGVsaW0iO2I6MDtzOjU6InBhcnRzIjthOjE6e2k6MDtzOjE6ImIiO319czo4OiJzdWJfdHJlZSI7YjowO3M6NToiZGVsaW0iO2I6MDt9fXM6NDoiRlJPTSI7YToxOntpOjA7YToxMDp7czo5OiJleHByX3R5cGUiO3M6NToidGFibGUiO3M6NToidGFibGUiO3M6NDoidGVzdCI7czo5OiJub19xdW90ZXMiO2E6Mjp7czo1OiJkZWxpbSI7YjowO3M6NToicGFydHMiO2E6MTp7aTowO3M6NDoidGVzdCI7fX1zOjU6ImFsaWFzIjtiOjA7czo1OiJoaW50cyI7YjowO3M6OToiam9pbl90eXBlIjtzOjQ6IkpPSU4iO3M6ODoicmVmX3R5cGUiO2I6MDtzOjEwOiJyZWZfY2xhdXNlIjtiOjA7czo5OiJiYXNlX2V4cHIiO3M6NDoidGVzdCI7czo4OiJzdWJfdHJlZSI7YjowO319fQ==