diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.3' into 4.4

This commit is contained in:
Tobias Schultze 2020-01-29 15:35:06 +01:00
parent c57378753c 14c355548a
commit 737a3e59a7
5 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Component/Cache/Traits/PdoTrait.php
View File

@ -403,6 +403,7 @@ trait PdoTrait
} else {
switch ($this->driver = $this->conn->getDriver()->getName()) {
case 'mysqli':
throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', \get_class($this)));
case 'pdo_mysql':
case 'drizzle_pdo_mysql':
$this->driver = 'mysql';

1
src/Symfony/Component/Lock/Store/PdoStore.php
View File

@ -317,6 +317,7 @@ class PdoStore implements StoreInterface
} else {
switch ($this->driver = $con->getDriver()->getName()) {
case 'mysqli':
throw new NotSupportedException(sprintf('The store "%s" does not support the mysqli driver, use pdo_mysql instead.', \get_class($this)));
case 'pdo_mysql':
case 'drizzle_pdo_mysql':
$this->driver = 'mysql';

33
src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php
View File

@ -207,7 +207,40 @@ class SerializerTest extends TestCase
$encoded = $serializer->encode($envelope);
$this->assertStringNotContainsString('DummySymfonySerializerNonSendableStamp', print_r($encoded['headers'], true));
}
public function testDecodingFailedConstructorDeserialization()
{
$serializer = new Serializer();
$this->expectException(MessageDecodingFailedException::class);
$serializer->decode([
'body' => '{}',
'headers' => ['type' => DummySymfonySerializerInvalidConstructor::class],
]);
}
public function testDecodingStampFailedDeserialization()
{
$serializer = new Serializer();
$this->expectException(MessageDecodingFailedException::class);
$serializer->decode([
'body' => '{"message":"hello"}',
'headers' => [
'type' => DummyMessage::class,
'X-Message-Stamp-'.SerializerStamp::class => '[{}]',
],
]);
}
}
class DummySymfonySerializerNonSendableStamp implements NonSendableStampInterface
{
}
class DummySymfonySerializerInvalidConstructor
{
public function __construct(string $missingArgument)
{
}
}

4
src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
View File

@ -85,13 +85,13 @@ class Connection
// check for extra keys in options
$optionsExtraKeys = array_diff(array_keys($options), array_keys(self::DEFAULT_OPTIONS));
if (0 < \count($optionsExtraKeys)) {
throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS))));
}
// check for extra keys in options
$queryExtraKeys = array_diff(array_keys($query), array_keys(self::DEFAULT_OPTIONS));
if (0 < \count($queryExtraKeys)) {
throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS))));
}
return $configuration;

6
src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
View File

@ -19,7 +19,7 @@ use Symfony\Component\Messenger\Stamp\SerializerStamp;
use Symfony\Component\Messenger\Stamp\StampInterface;
use Symfony\Component\Serializer\Encoder\JsonEncoder;
use Symfony\Component\Serializer\Encoder\XmlEncoder;
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
use Symfony\Component\Serializer\Exception\ExceptionInterface;
use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
use Symfony\Component\Serializer\Serializer as SymfonySerializer;
@ -79,7 +79,7 @@ class Serializer implements SerializerInterface
try {
$message = $this->serializer->deserialize($encodedEnvelope['body'], $encodedEnvelope['headers']['type'], $this->format, $context);
} catch (UnexpectedValueException $e) {
} catch (ExceptionInterface $e) {
throw new MessageDecodingFailedException(sprintf('Could not decode message: %s.', $e->getMessage()), $e->getCode(), $e);
}
@ -117,7 +117,7 @@ class Serializer implements SerializerInterface
try {
$stamps[] = $this->serializer->deserialize($value, substr($name, \strlen(self::STAMP_HEADER_PREFIX)).'[]', $this->format, $this->context);
} catch (UnexpectedValueException $e) {
} catch (ExceptionInterface $e) {
throw new MessageDecodingFailedException(sprintf('Could not decode stamp: %s.', $e->getMessage()), $e->getCode(), $e);
}
}