Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed exportVariable multiple backslash problem #1335

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Util/GlobalState.php
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,9 @@ protected static function exportVariable($variable)
return var_export($variable, true);
}

return 'unserialize(\'' .
str_replace("'", "\'", serialize($variable)) .
'\')';
return 'unserialize(' .
var_export(serialize($variable), true) .
')';
}

protected static function arrayOnlyContainsScalars(array $array)
Expand Down
91 changes: 91 additions & 0 deletions tests/Util/GlobalStateTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?php
/**
* PHPUnit
*
* Copyright (c) 2001-2014, Sebastian Bergmann <[email protected]>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* * Neither the name of Sebastian Bergmann nor the names of his
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* @package PHPUnit
* @author Blake Williams <[email protected]>
* @copyright 2001-2014 Sebastian Bergmann <[email protected]>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
*/

/**
*
*
* @package PHPUnit
* @author Blake Williams <[email protected]>
* @copyright 2001-2014 Sebastian Bergmann <[email protected]>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
*/
class Util_GlobalStateTest extends PHPUnit_Framework_TestCase
{
public function validExportVariableProvider()
{
return array(
array("Hello"),
array(1),
array(1234.56),
array(0),
array(true),
array(false),
array(null),
array(array("foo")),
array(array(array("foo"))),
array((object)array("foo"=>"bar")),
array((object)array("foo"=>"back\\slash")),
array((object)array("foo"=>"back\\\\slash")),
);
}

/**
* @dataProvider validExportVariableProvider
* @covers PHPUnit_Util_GlobalState::exportVariable
*/
public function testValidExportVariable($value)
{
$method = new ReflectionMethod('PHPUnit_Util_GlobalState', 'exportVariable');
$method->setAccessible(true);
$exported = $method->invoke(null, $value);
if ($exported === false)
throw new UnexpectedValueException();

eval('$result = '.$exported.';');
if (is_object($value))
$this->assertEquals($value, $result);
else
$this->assertSame($value, $result);
}
}