| {{ loop.index }} |
- {{ trace.name }} |
- {{ trace.path }} |
+ {{ trace.name }} |
+ {{ trace.path }} |
{% if trace.level == 1 %}
Path almost matches, but
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 4f2afa6644..be295a302e 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -58,7 +58,7 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase
protected function assertMatchesXpath($html, $expression, $count = 1)
{
- $dom = new \DomDocument('UTF-8');
+ $dom = new \DOMDocument('UTF-8');
try {
// Wrap in node so we can load HTML with multiple tags at
// the top level
diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
index 831b109325..9bd917a7ef 100644
--- a/src/Symfony/Component/Process/InputStream.php
+++ b/src/Symfony/Component/Process/InputStream.php
@@ -20,6 +20,7 @@ use Symfony\Component\Process\Exception\RuntimeException;
*/
class InputStream implements \IteratorAggregate
{
+ /** @var null|callable */
private $onEmpty = null;
private $input = array();
private $open = true;
@@ -35,7 +36,8 @@ class InputStream implements \IteratorAggregate
/**
* Appends an input to the write buffer.
*
- * @param resource|scalar|\Traversable|null The input to append as stream resource, scalar or \Traversable
+ * @param resource|string|int|float|bool|\Traversable|null The input to append as scalar,
+ * stream resource or \Traversable
*/
public function write($input)
{
diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
index ba79c32702..2bd1fe75b7 100644
--- a/src/Symfony/Component/Process/Pipes/AbstractPipes.php
+++ b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
@@ -27,7 +27,7 @@ abstract class AbstractPipes implements PipesInterface
private $blocked = true;
/**
- * @param resource|scalar|\Iterator|null $input
+ * @param resource|string|int|float|bool|\Iterator|null $input
*/
public function __construct($input)
{
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 1b17f8984d..948dc90e4b 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -1162,7 +1162,7 @@ class Process implements \IteratorAggregate
*
* This content will be passed to the underlying process standard input.
*
- * @param resource|scalar|\Traversable|null $input The content
+ * @param string|int|float|bool|resource|\Traversable|null $input The content
*
* @return self The current Process instance
*
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
index 26257c21e6..a91147cb9f 100644
--- a/src/Symfony/Component/Process/ProcessBuilder.php
+++ b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -167,7 +167,7 @@ class ProcessBuilder
/**
* Sets the input of the process.
*
- * @param resource|scalar|\Traversable|null $input The input content
+ * @param resource|string|int|float|bool|\Traversable|null $input The input content
*
* @return $this
*
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index 63391bb3df..51abdc649e 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -45,6 +45,8 @@ class ContextListener implements ListenerInterface
private $trustResolver;
private $logoutOnUserChange = false;
+ private static $unserializeExceptionCode = 0x37313bc;
+
/**
* @param TokenStorageInterface $tokenStorage
* @param iterable|UserProviderInterface[] $userProviders
@@ -96,7 +98,7 @@ class ContextListener implements ListenerInterface
return;
}
- $token = unserialize($token);
+ $token = $this->safelyUnserialize($token);
if (null !== $this->logger) {
$this->logger->debug('Read existing security token from the session.', array(
@@ -219,4 +221,43 @@ class ContextListener implements ListenerInterface
throw new \RuntimeException(sprintf('There is no user provider for user "%s".', get_class($user)));
}
+
+ private function safelyUnserialize($serializedToken)
+ {
+ $e = $token = null;
+ $prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
+ $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$prevErrorHandler) {
+ if (__FILE__ === $file) {
+ throw new \UnexpectedValueException($msg, self::$unserializeExceptionCode);
+ }
+
+ return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
+ });
+
+ try {
+ $token = unserialize($serializedToken);
+ } catch (\Error $e) {
+ } catch (\Exception $e) {
+ }
+ restore_error_handler();
+ ini_set('unserialize_callback_func', $prevUnserializeHandler);
+ if ($e) {
+ if (!$e instanceof \UnexpectedValueException || self::$unserializeExceptionCode !== $e->getCode()) {
+ throw $e;
+ }
+ if ($this->logger) {
+ $this->logger->warning('Failed to unserialize the security token from the session.', array('key' => $this->sessionKey, 'received' => $serializedToken, 'exception' => $e));
+ }
+ }
+
+ return $token;
+ }
+
+ /**
+ * @internal
+ */
+ public static function handleUnserializeCallback($class)
+ {
+ throw new \UnexpectedValueException('Class not found: '.$class, self::$unserializeExceptionCode);
+ }
}
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index d27569fa3a..d05f2da832 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -173,6 +173,8 @@ class ContextListenerTest extends TestCase
public function provideInvalidToken()
{
return array(
+ array('foo'),
+ array('O:8:"NotFound":0:{}'),
array(serialize(new \__PHP_Incomplete_Class())),
array(serialize(null)),
array(null),
diff --git a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
index f31870e1bf..077e4422e4 100644
--- a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
+++ b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
@@ -27,7 +27,7 @@ interface EncoderInterface
* @param string $format Format name
* @param array $context Options that normalizers/encoders have access to
*
- * @return scalar
+ * @return string|int|float|bool
*
* @throws UnexpectedValueException
*/
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
index eff486e1c8..ef084eeab2 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -38,7 +38,7 @@ class JsonEncode implements EncoderInterface
$encodedJson = json_encode($data, $context['json_encode_options']);
- if (JSON_ERROR_NONE !== json_last_error()) {
+ if (JSON_ERROR_NONE !== json_last_error() && (false === $encodedJson || !($context['json_encode_options'] & JSON_PARTIAL_OUTPUT_ON_ERROR))) {
throw new NotEncodableValueException(json_last_error_msg());
}
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
index 702b1bcb59..5db15418b5 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
@@ -27,12 +27,12 @@ interface DenormalizableInterface
* It is important to understand that the denormalize() call should denormalize
* recursively all child objects of the implementor.
*
- * @param DenormalizerInterface $denormalizer The denormalizer is given so that you
- * can use it to denormalize objects contained within this object
- * @param array|scalar $data The data from which to re-create the object
- * @param string|null $format The format is optionally given to be able to denormalize differently
- * based on different input formats
- * @param array $context Options for denormalizing
+ * @param DenormalizerInterface $denormalizer The denormalizer is given so that you
+ * can use it to denormalize objects contained within this object
+ * @param array|string|int|float|bool $data The data from which to re-create the object
+ * @param string|null $format The format is optionally given to be able to denormalize
+ * differently based on different input formats
+ * @param array $context Options for denormalizing
*
* @return object
*/
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
index b275228642..8542e4f80e 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
@@ -33,7 +33,7 @@ interface NormalizableInterface
* based on different output formats
* @param array $context Options for normalizing this object
*
- * @return array|scalar
+ * @return array|string|int|float|bool
*/
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array());
}
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
index 7f26c0404e..5d0e3d1495 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -29,7 +29,7 @@ interface NormalizerInterface
* @param string $format Format the normalization result will be encoded as
* @param array $context Context options for the normalizer
*
- * @return array|scalar
+ * @return array|string|int|float|bool
*
* @throws InvalidArgumentException Occurs when the object given is not an attempted type for the normalizer
* @throws CircularReferenceException Occurs when the normalizer detects a circular reference when no circular
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
index ad8d57065f..b08b6d5b50 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
@@ -65,6 +65,44 @@ class JsonEncoderTest extends TestCase
$this->assertEquals($expected, $this->serializer->serialize($arr, 'json'), 'Context should not be persistent');
}
+ /**
+ * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+ */
+ public function testEncodeNotUtf8WithoutPartialOnError()
+ {
+ $arr = array(
+ 'utf8' => 'Hello World!',
+ 'notUtf8' => "\xb0\xd0\xb5\xd0",
+ );
+
+ $this->encoder->encode($arr, 'json');
+ }
+
+ public function testEncodeNotUtf8WithPartialOnError()
+ {
+ $context = array('json_encode_options' => JSON_PARTIAL_OUTPUT_ON_ERROR);
+
+ $arr = array(
+ 'utf8' => 'Hello World!',
+ 'notUtf8' => "\xb0\xd0\xb5\xd0",
+ );
+
+ $result = $this->encoder->encode($arr, 'json', $context);
+ $jsonLastError = json_last_error();
+
+ $this->assertSame(JSON_ERROR_UTF8, $jsonLastError);
+ $this->assertEquals('{"utf8":"Hello World!","notUtf8":null}', $result);
+
+ $this->assertEquals('0', $this->serializer->serialize(NAN, 'json', $context));
+ }
+
+ public function testDecodeFalseString()
+ {
+ $result = $this->encoder->decode('false', 'json');
+ $this->assertSame(JSON_ERROR_NONE, json_last_error());
+ $this->assertFalse($result);
+ }
+
protected function getJsonSource()
{
return '{"foo":"foo","bar":["a","b"],"baz":{"key":"val","key2":"val","A B":"bar","item":[{"title":"title1"},{"title":"title2"}],"Barry":{"FooBar":{"Baz":"Ed","@id":1}}},"qux":"1"}';
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index 4353bcb437..aa06b1cfb0 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -63,7 +63,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
/**
* @param bool $recursive Whether values should be resolved recursively or not
*
- * @return scalar|array|null|Data[] A native representation of the original value
+ * @return string|int|float|bool|array|null|Data[] A native representation of the original value
*/
public function getValue($recursive = false)
{
diff --git a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
index cb7981694f..cb498ff706 100644
--- a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
+++ b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
@@ -21,9 +21,9 @@ interface DumperInterface
/**
* Dumps a scalar value.
*
- * @param Cursor $cursor The Cursor position in the dump
- * @param string $type The PHP type of the value being dumped
- * @param scalar $value The scalar value being dumped
+ * @param Cursor $cursor The Cursor position in the dump
+ * @param string $type The PHP type of the value being dumped
+ * @param string|int|float|bool $value The scalar value being dumped
*/
public function dumpScalar(Cursor $cursor, $type, $value);
|