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

Merge branch '4.3' into 4.4

Browse Source 
* 4.3:
  [VarDumper] Remove useless variable
  [Console] Fix incomplete output mock.
  [Serializer] Fixed docblocks and parameter names.
This commit is contained in:
Nicolas Grekas 2019-08-16 08:37:15 +02:00
commit 940eabb121
16 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Console/Tests/Helper/DumperTest.php
View File

@ -37,7 +37,10 @@ class DumperTest extends TestCase
*/
public function testInvoke($variable)
{
$dumper = new Dumper($this->getMockBuilder(OutputInterface::class)->getMock());
$output = $this->getMockBuilder(OutputInterface::class)->getMock();
$output->method('isDecorated')->willReturn(false);
$dumper = new Dumper($output);
$this->assertDumpMatchesFormat($dumper($variable), $variable);
}

2
src/Symfony/Component/Serializer/Mapping/Factory/ClassResolverTrait.php
View File

@ -25,6 +25,8 @@ trait ClassResolverTrait
/**
* Gets a class name for a given class or instance.
*
* @param object|string $value
*
* @throws InvalidArgumentException If the class does not exists
*/
private function getClass($value): string

10
src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
View File

@ -321,18 +321,18 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
/**
* {@inheritdoc}
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
if (!isset($context['cache_key'])) {
$context['cache_key'] = $this->getCacheKey($format, $context);
}
$allowedAttributes = $this->getAllowedAttributes($class, $context, true);
$allowedAttributes = $this->getAllowedAttributes($type, $context, true);
$normalizedData = $this->prepareForDenormalization($data);
$extraAttributes = [];
$reflectionClass = new \ReflectionClass($class);
$object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
$reflectionClass = new \ReflectionClass($type);
$object = $this->instantiateObject($normalizedData, $type, $context, $reflectionClass, $allowedAttributes, $format);
$resolvedClass = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
foreach ($normalizedData as $attribute => $value) {
@ -359,7 +359,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
try {
$this->setAttributeValue($object, $attribute, $value, $format, $context);
} catch (InvalidArgumentException $e) {
throw new NotNormalizableValueException(sprintf('Failed to denormalize attribute "%s" value for class "%s": %s.', $attribute, $class, $e->getMessage()), $e->getCode(), $e);
throw new NotNormalizableValueException(sprintf('Failed to denormalize attribute "%s" value for class "%s": %s.', $attribute, $type, $e->getMessage()), $e->getCode(), $e);
}
}

10
src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
View File

@ -36,7 +36,7 @@ class ArrayDenormalizer implements ContextAwareDenormalizerInterface, Serializer
*
* @throws NotNormalizableValueException
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
if (null === $this->serializer) {
throw new BadMethodCallException('Please set a serializer before calling denormalize()!');
@ -44,12 +44,12 @@ class ArrayDenormalizer implements ContextAwareDenormalizerInterface, Serializer
if (!\is_array($data)) {
throw new InvalidArgumentException('Data expected to be an array, '.\gettype($data).' given.');
}
if ('[]' !== substr($class, -2)) {
throw new InvalidArgumentException('Unsupported class: '.$class);
if ('[]' !== substr($type, -2)) {
throw new InvalidArgumentException('Unsupported class: '.$type);
}
$serializer = $this->serializer;
$class = substr($class, 0, -2);
$type = substr($type, 0, -2);
$builtinType = isset($context['key_type']) ? $context['key_type']->getBuiltinType() : null;
foreach ($data as $key => $value) {
@ -57,7 +57,7 @@ class ArrayDenormalizer implements ContextAwareDenormalizerInterface, Serializer
throw new NotNormalizableValueException(sprintf('The type of the key "%s" must be "%s" ("%s" given).', $key, $builtinType, \gettype($key)));
}
$data[$key] = $serializer->denormalize($value, $class, $format, $context);
$data[$key] = $serializer->denormalize($value, $type, $format, $context);
}
return $data;

4
src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
View File

@ -33,9 +33,9 @@ class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, Se
/**
* {@inheritdoc}
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
$object = $this->extractObjectToPopulate($class, $context) ?: new $class();
$object = $this->extractObjectToPopulate($type, $context) ?: new $type();
$object->denormalize($this->serializer, $data, $format, $context);
return $object;

6
src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
View File

@ -103,14 +103,14 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
* @throws InvalidArgumentException
* @throws NotNormalizableValueException
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
if (!preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
throw new NotNormalizableValueException('The provided "data:" URI is not valid.');
}
try {
switch ($class) {
switch ($type) {
case 'Symfony\Component\HttpFoundation\File\File':
return new File($data, false);
@ -122,7 +122,7 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
throw new NotNormalizableValueException($exception->getMessage(), $exception->getCode(), $exception);
}
throw new InvalidArgumentException(sprintf('The class parameter "%s" is not supported. It must be one of "SplFileInfo", "SplFileObject" or "Symfony\Component\HttpFoundation\File\File".', $class));
throw new InvalidArgumentException(sprintf('The class parameter "%s" is not supported. It must be one of "SplFileInfo", "SplFileObject" or "Symfony\Component\HttpFoundation\File\File".', $type));
}
/**

2
src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
View File

@ -78,7 +78,7 @@ class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterfa
* @throws InvalidArgumentException
* @throws UnexpectedValueException
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
if (!\is_string($data)) {
throw new InvalidArgumentException(sprintf('Data expected to be a string, %s given.', \gettype($data)));

8
src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
View File

@ -88,7 +88,7 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,
*
* @throws NotNormalizableValueException
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
$dateTimeFormat = $context[self::FORMAT_KEY] ?? null;
$timezone = $this->getTimezone($context);
@ -98,13 +98,13 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,
}
if (null !== $dateTimeFormat) {
$object = \DateTime::class === $class ? \DateTime::createFromFormat($dateTimeFormat, $data, $timezone) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data, $timezone);
$object = \DateTime::class === $type ? \DateTime::createFromFormat($dateTimeFormat, $data, $timezone) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data, $timezone);
if (false !== $object) {
return $object;
}
$dateTimeErrors = \DateTime::class === $class ? \DateTime::getLastErrors() : \DateTimeImmutable::getLastErrors();
$dateTimeErrors = \DateTime::class === $type ? \DateTime::getLastErrors() : \DateTimeImmutable::getLastErrors();
throw new NotNormalizableValueException(sprintf(
'Parsing datetime string "%s" using format "%s" resulted in %d errors:'."\n".'%s',
@ -116,7 +116,7 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,
}
try {
return \DateTime::class === $class ? new \DateTime($data, $timezone) : new \DateTimeImmutable($data, $timezone);
return \DateTime::class === $type ? new \DateTime($data, $timezone) : new \DateTimeImmutable($data, $timezone);
} catch (\Exception $e) {
throw new NotNormalizableValueException($e->getMessage(), $e->getCode(), $e);
}

2
src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
View File

@ -48,7 +48,7 @@ class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterfa
*
* @throws NotNormalizableValueException
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
if ('' === $data || null === $data) {
throw new NotNormalizableValueException('The data is either an empty string or null, you should pass a string that can be parsed as a DateTimeZone.');

4
src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
View File

@ -30,7 +30,7 @@ interface DenormalizerInterface
* Denormalizes data back into an object of the given class.
*
* @param mixed $data Data to restore
* @param string $class The expected class to instantiate
* @param string $type The expected class to instantiate
* @param string $format Format the given data was extracted from
* @param array $context Options available to the denormalizer
*
@ -44,7 +44,7 @@ interface DenormalizerInterface
* @throws RuntimeException Occurs if the class cannot be instantiated
* @throws ExceptionInterface Occurs for all the other cases of errors
*/
public function denormalize($data, $class, $format = null, array $context = []);
public function denormalize($data, $type, $format = null, array $context = []);
/**
* Checks whether the given class is supported for denormalization by this normalizer.

2
src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
View File

@ -60,7 +60,7 @@ class JsonSerializableNormalizer extends AbstractNormalizer
/**
* {@inheritdoc}
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
throw new LogicException(sprintf('Cannot denormalize with "%s".', \JsonSerializable::class));
}

7
src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
View File

@ -17,10 +17,9 @@ trait ObjectToPopulateTrait
* Extract the `object_to_populate` field from the context if it exists
* and is an instance of the provided $class.
*
* @param string $class The class the object should be
* @param $context The denormalization context
* @param string $key They in which to look for the object to populate.
* Keeps backwards compatibility with `AbstractNormalizer`.
* @param string $class The class the object should be
* @param string|null $key They in which to look for the object to populate.
* Keeps backwards compatibility with `AbstractNormalizer`.
*
* @return object|null an object if things check out, null otherwise
*/

2
src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
View File

@ -46,7 +46,7 @@ class AbstractNormalizerDummy extends AbstractNormalizer
/**
* {@inheritdoc}
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
}

6
src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
View File

@ -363,13 +363,13 @@ class ArrayDenormalizerDummy implements DenormalizerInterface, SerializerAwareIn
*
* @throws NotNormalizableValueException
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
$serializer = $this->serializer;
$class = substr($class, 0, -2);
$type = substr($type, 0, -2);
foreach ($data as $key => $value) {
$data[$key] = $serializer->denormalize($value, $class, $format, $context);
$data[$key] = $serializer->denormalize($value, $type, $format, $context);
}
return $data;

2
src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
View File

@ -23,7 +23,7 @@ class TestDenormalizer implements DenormalizerInterface
/**
* {@inheritdoc}
*/
public function denormalize($data, $class, $format = null, array $context = [])
public function denormalize($data, $type, $format = null, array $context = [])
{
}

4
src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
View File

@ -26,7 +26,7 @@ class FunctionsTest extends TestCase
ob_start();
$return = dump($var1);
$out = ob_get_clean();
ob_end_clean();
$this->assertEquals($var1, $return);
}
@ -41,7 +41,7 @@ class FunctionsTest extends TestCase
ob_start();
$return = dump($var1, $var2, $var3);
$out = ob_get_clean();
ob_end_clean();
$this->assertEquals([$var1, $var2, $var3], $return);
}