fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 03:52:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove characters in writePHPData() comment that could cause syntax error

Browse source
This commit is contained in:
Kijin Sung 2023-09-05 02:07:21 +09:00
parent 206f6e706a
commit 0f1ea1dbc2
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/framework/Storage.php
View file

@ -363,15 +363,18 @@ class Storage
{ {
if ($comment !== null) if ($comment !== null)
{ {
$comment = "/* $comment */\n"; $comment = '/* ' . preg_replace_callback('/[\x00-\x1f\xff*?<>\/\\\\\'"]/', function($match) {
return rawurlencode($match[0]);
}, $comment) . " */\n";
} }
if ($serialize) if ($serialize)
{ {
$content = '<' . '?php ' . $comment . 'return unserialize(' . var_export(serialize($data), true) . ');'; $content = '<' . '?php ' . $comment . 'return unserialize(' . var_export(serialize($data), true) . ');' . PHP_EOL;
} }
else else
{ {
$content = '<' . '?php ' . $comment . 'return ' . var_export($data, true) . ';'; $content = '<' . '?php ' . $comment . 'return ' . var_export($data, true) . ';' . PHP_EOL;
} }
return self::write($filename, $content); return self::write($filename, $content);
} }

4
tests/unit/framework/StorageTest.php
View file

@ -198,9 +198,13 @@ class StorageTest extends \Codeception\TestCase\Test
{ {
$testfile = \RX_BASEDIR . 'tests/_output/test.php'; $testfile = \RX_BASEDIR . 'tests/_output/test.php';
$data = array('foo' => 'bar', 'baz' => array('rhymix' => '\'"special\\chars' . chr(0) . chr(255), 'test' => 'wow')); $data = array('foo' => 'bar', 'baz' => array('rhymix' => '\'"special\\chars' . chr(0) . chr(255), 'test' => 'wow'));
$comment = 'Hello world */' . PHP_EOL . '?><?php return; ?>';
$this->assertTrue(Rhymix\Framework\Storage::writePHPData($testfile, $data)); $this->assertTrue(Rhymix\Framework\Storage::writePHPData($testfile, $data));
$this->assertEquals($data, Rhymix\Framework\Storage::readPHPData($testfile)); $this->assertEquals($data, Rhymix\Framework\Storage::readPHPData($testfile));
$this->assertTrue(Rhymix\Framework\Storage::writePHPData($testfile, $data, $comment));
$this->assertEquals($data, Rhymix\Framework\Storage::readPHPData($testfile));
} }
public function testCopy() public function testCopy()