*/
@@ -31,9 +34,15 @@ class PhpStanExtractorTest extends TestCase
*/
private $extractor;
+ /**
+ * @var PhpDocExtractor
+ */
+ private $phpDocExtractor;
+
protected function setUp(): void
{
$this->extractor = new PhpStanExtractor();
+ $this->phpDocExtractor = new PhpDocExtractor();
}
/**
@@ -383,6 +392,15 @@ public function testDummyNamespace()
$this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\DummyNamespace', 'dummy')
);
}
+
+ public function testDummyNamespaceWithProperty()
+ {
+ $phpStanTypes = $this->extractor->getTypes(\B\Dummy::class, 'property');
+ $phpDocTypes = $this->phpDocExtractor->getTypes(\B\Dummy::class, 'property');
+
+ $this->assertEquals('A\Property', $phpStanTypes[0]->getClassName());
+ $this->assertEquals($phpDocTypes[0]->getClassName(), $phpStanTypes[0]->getClassName());
+ }
}
class PhpStanOmittedParamTagTypeDocBlock
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Extractor/DummyNamespace.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Extractor/DummyNamespace.php
new file mode 100644
index 0000000000000..fd590af64709e
--- /dev/null
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Extractor/DummyNamespace.php
@@ -0,0 +1,20 @@
+refillTime->format('P%y%m%dDT%HH%iM%sS').'-'.$this->refillAmount;
+ return $this->refillTime->format('P%yY%mM%dDT%HH%iM%sS').'-'.$this->refillAmount;
}
}
diff --git a/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php b/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
index 7bc85e522613b..1eed0cbc6ec42 100644
--- a/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
+++ b/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
@@ -43,11 +43,6 @@ final class SlidingWindow implements LimiterStateInterface
*/
private $windowEndAt;
- /**
- * @var bool true if this window has been cached
- */
- private $cached = true;
-
public function __construct(string $id, int $intervalInSeconds)
{
if ($intervalInSeconds < 1) {
@@ -56,7 +51,6 @@ public function __construct(string $id, int $intervalInSeconds)
$this->id = $id;
$this->intervalInSeconds = $intervalInSeconds;
$this->windowEndAt = microtime(true) + $intervalInSeconds;
- $this->cached = false;
}
public static function createFromPreviousWindow(self $window, int $intervalInSeconds): self
@@ -72,31 +66,17 @@ public static function createFromPreviousWindow(self $window, int $intervalInSec
return $new;
}
- /**
- * @internal
- */
- public function __sleep(): array
- {
- // $cached is not serialized, it should only be set
- // upon first creation of the window.
- return ['id', 'hitCount', 'intervalInSeconds', 'hitCountForLastWindow', 'windowEndAt'];
- }
-
public function getId(): string
{
return $this->id;
}
/**
- * Store for the rest of this time frame and next.
+ * Returns the remaining of this timeframe and the next one.
*/
- public function getExpirationTime(): ?int
+ public function getExpirationTime(): int
{
- if ($this->cached) {
- return null;
- }
-
- return 2 * $this->intervalInSeconds;
+ return $this->windowEndAt + $this->intervalInSeconds - microtime(true);
}
public function isExpired(): bool
@@ -124,4 +104,31 @@ public function getRetryAfter(): \DateTimeImmutable
{
return \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', $this->windowEndAt));
}
+
+ public function __serialize(): array
+ {
+ return [
+ pack('NNN', $this->hitCount, $this->hitCountForLastWindow, $this->intervalInSeconds).$this->id => $this->windowEndAt,
+ ];
+ }
+
+ public function __unserialize(array $data): void
+ {
+ // BC layer for old objects serialized via __sleep
+ if (5 === \count($data)) {
+ $data = array_values($data);
+ $this->id = $data[0];
+ $this->hitCount = $data[1];
+ $this->intervalInSeconds = $data[2];
+ $this->hitCountForLastWindow = $data[3];
+ $this->windowEndAt = $data[4];
+
+ return;
+ }
+
+ $pack = key($data);
+ $this->windowEndAt = $data[$pack];
+ ['a' => $this->hitCount, 'b' => $this->hitCountForLastWindow, 'c' => $this->intervalInSeconds] = unpack('Na/Nb/Nc', $pack);
+ $this->id = substr($pack, 12);
+ }
}
diff --git a/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php b/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php
index c703a71a7f38f..520be6ed691cf 100644
--- a/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php
+++ b/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php
@@ -20,7 +20,6 @@
*/
final class TokenBucket implements LimiterStateInterface
{
- private $stringRate;
private $id;
private $rate;
@@ -47,8 +46,6 @@ final class TokenBucket implements LimiterStateInterface
*/
public function __construct(string $id, int $initialTokens, Rate $rate, float $timer = null)
{
- unset($this->stringRate);
-
if ($initialTokens < 1) {
throw new \InvalidArgumentException(sprintf('Cannot set the limit of "%s" to 0, as that would never accept any hit.', TokenBucketLimiter::class));
}
@@ -91,9 +88,35 @@ public function getExpirationTime(): int
return $this->rate->calculateTimeForTokens($this->burstSize);
}
- /**
- * @internal
- */
+ public function __serialize(): array
+ {
+ return [
+ pack('N', $this->burstSize).$this->id => $this->tokens,
+ (string) $this->rate => $this->timer,
+ ];
+ }
+
+ public function __unserialize(array $data): void
+ {
+ // BC layer for old objects serialized via __sleep
+ if (5 === \count($data)) {
+ $data = array_values($data);
+ $this->id = $data[0];
+ $this->tokens = $data[1];
+ $this->timer = $data[2];
+ $this->burstSize = $data[3];
+ $this->rate = Rate::fromString($data[4]);
+
+ return;
+ }
+
+ [$this->tokens, $this->timer] = array_values($data);
+ [$pack, $rate] = array_keys($data);
+ $this->rate = Rate::fromString($rate);
+ $this->burstSize = unpack('Na', $pack)['a'];
+ $this->id = substr($pack, 4);
+ }
+
public function __sleep(): array
{
$this->stringRate = (string) $this->rate;
@@ -101,16 +124,11 @@ public function __sleep(): array
return ['id', 'tokens', 'timer', 'burstSize', 'stringRate'];
}
- /**
- * @internal
- */
public function __wakeup(): void
{
- if (!\is_string($this->stringRate)) {
- throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+ if (\is_string($rate = $this->stringRate ?? null)) {
+ $this->rate = Rate::fromString($rate);
+ unset($this->stringRate);
}
-
- $this->rate = Rate::fromString($this->stringRate);
- unset($this->stringRate);
}
}
diff --git a/src/Symfony/Component/RateLimiter/Policy/Window.php b/src/Symfony/Component/RateLimiter/Policy/Window.php
index 686bb3fdbb164..93452797075a0 100644
--- a/src/Symfony/Component/RateLimiter/Policy/Window.php
+++ b/src/Symfony/Component/RateLimiter/Policy/Window.php
@@ -85,4 +85,31 @@ public function calculateTimeForTokens(int $tokens): int
return $cyclesRequired * $this->intervalInSeconds;
}
+
+ public function __serialize(): array
+ {
+ return [
+ $this->id => $this->timer,
+ pack('NN', $this->hitCount, $this->intervalInSeconds) => $this->maxSize,
+ ];
+ }
+
+ public function __unserialize(array $data): void
+ {
+ // BC layer for old objects serialized via __sleep
+ if (5 === \count($data)) {
+ $data = array_values($data);
+ $this->id = $data[0];
+ $this->hitCount = $data[1];
+ $this->intervalInSeconds = $data[2];
+ $this->maxSize = $data[3];
+ $this->timer = $data[4];
+
+ return;
+ }
+
+ [$this->timer, $this->maxSize] = array_values($data);
+ [$this->id, $pack] = array_keys($data);
+ ['a' => $this->hitCount, 'b' => $this->intervalInSeconds] = unpack('Na/Nb', $pack);
+ }
}
diff --git a/src/Symfony/Component/RateLimiter/Tests/Policy/RateTest.php b/src/Symfony/Component/RateLimiter/Tests/Policy/RateTest.php
new file mode 100644
index 0000000000000..39a859f587555
--- /dev/null
+++ b/src/Symfony/Component/RateLimiter/Tests/Policy/RateTest.php
@@ -0,0 +1,37 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RateLimiter\Tests\Policy;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\RateLimiter\Policy\Rate;
+
+class RateTest extends TestCase
+{
+ /**
+ * @dataProvider provideRate
+ */
+ public function testFromString(Rate $rate)
+ {
+ $this->assertEquals($rate, Rate::fromString((string) $rate));
+ }
+
+ public function provideRate(): iterable
+ {
+ yield [new Rate(\DateInterval::createFromDateString('15 seconds'), 10)];
+ yield [Rate::perSecond(10)];
+ yield [Rate::perMinute(10)];
+ yield [Rate::perHour(10)];
+ yield [Rate::perDay(10)];
+ yield [Rate::perMonth(10)];
+ yield [Rate::perYear(10)];
+ }
+}
diff --git a/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php b/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
index df1d01499679b..f63ec433e6344 100644
--- a/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
+++ b/src/Symfony/Component/RateLimiter/Tests/Policy/SlidingWindowTest.php
@@ -28,8 +28,9 @@ public function testGetExpirationTime()
$this->assertSame(2 * 10, $window->getExpirationTime());
$data = serialize($window);
+ sleep(10);
$cachedWindow = unserialize($data);
- $this->assertNull($cachedWindow->getExpirationTime());
+ $this->assertSame(10, $cachedWindow->getExpirationTime());
$new = SlidingWindow::createFromPreviousWindow($cachedWindow, 15);
$this->assertSame(2 * 15, $new->getExpirationTime());
diff --git a/src/Symfony/Component/Runtime/Internal/SymfonyErrorHandler.php b/src/Symfony/Component/Runtime/Internal/SymfonyErrorHandler.php
index bf6e1cfe331a1..40c125a91e333 100644
--- a/src/Symfony/Component/Runtime/Internal/SymfonyErrorHandler.php
+++ b/src/Symfony/Component/Runtime/Internal/SymfonyErrorHandler.php
@@ -29,7 +29,7 @@ public static function register(bool $debug): void
if (class_exists(ErrorHandler::class)) {
DebugClassLoader::enable();
restore_error_handler();
- ErrorHandler::register(new ErrorHandler(new BufferingLogger(), true));
+ ErrorHandler::register(new ErrorHandler(new BufferingLogger(), $debug));
}
}
}
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php
index dabc719055fcf..340bc87c2e32e 100644
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php
+++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php
@@ -45,11 +45,11 @@ public function verifyToken(PersistentTokenInterface $token, string $tokenValue)
}
$cacheKey = $this->getCacheKey($token);
- if (!$this->cache->hasItem($cacheKey)) {
+ $item = $this->cache->getItem($cacheKey);
+ if (!$item->isHit()) {
return false;
}
- $item = $this->cache->getItem($cacheKey);
$outdatedToken = $item->get();
return hash_equals($outdatedToken, $tokenValue);
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
index f6a36561c19b3..1b30d5a7ccda6 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
@@ -33,7 +33,7 @@ public function getCredentials()
public function getUser()
{
- return '';
+ return null;
}
public function setUser($user)
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 885e554b4593a..951eb9d4a59b8 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -239,12 +239,12 @@ private function getAttributeNormalizationContext(object $object, string $attrib
*/
private function getAttributeDenormalizationContext(string $class, string $attribute, array $context): array
{
+ $context['deserialization_path'] = ($context['deserialization_path'] ?? false) ? $context['deserialization_path'].'.'.$attribute : $attribute;
+
if (null === $metadata = $this->getAttributeMetadata($class, $attribute)) {
return $context;
}
- $context['deserialization_path'] = ($context['deserialization_path'] ?? false) ? $context['deserialization_path'].'.'.$attribute : $attribute;
-
return array_merge($context, $metadata->getDenormalizationContextForGroups($this->getGroups($context)));
}
@@ -442,6 +442,7 @@ abstract protected function setAttributeValue(object $object, string $attribute,
private function validateAndDenormalize(array $types, string $currentClass, string $attribute, $data, ?string $format, array $context)
{
$expectedTypes = [];
+ $isUnionType = \count($types) > 1;
foreach ($types as $type) {
if (null === $data && $type->isNullable()) {
return null;
@@ -455,117 +456,128 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
$data = [$data];
}
- // In XML and CSV all basic datatypes are represented as strings, it is e.g. not possible to determine,
- // if a value is meant to be a string, float, int or a boolean value from the serialized representation.
- // That's why we have to transform the values, if one of these non-string basic datatypes is expected.
- if (\is_string($data) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
- if ('' === $data) {
- if (Type::BUILTIN_TYPE_ARRAY === $builtinType = $type->getBuiltinType()) {
- return [];
- }
-
- if ($type->isNullable() && \in_array($builtinType, [Type::BUILTIN_TYPE_BOOL, Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_FLOAT], true)) {
- return null;
- }
- }
-
- switch ($builtinType ?? $type->getBuiltinType()) {
- case Type::BUILTIN_TYPE_BOOL:
- // according to https://www.w3.org/TR/xmlschema-2/#boolean, valid representations are "false", "true", "0" and "1"
- if ('false' === $data || '0' === $data) {
- $data = false;
- } elseif ('true' === $data || '1' === $data) {
- $data = true;
- } else {
- throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the "%s" attribute for class "%s" must be bool ("%s" given).', $attribute, $currentClass, $data), $data, [Type::BUILTIN_TYPE_BOOL], $context['deserialization_path'] ?? null);
- }
- break;
- case Type::BUILTIN_TYPE_INT:
- if (ctype_digit($data) || '-' === $data[0] && ctype_digit(substr($data, 1))) {
- $data = (int) $data;
- } else {
- throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the "%s" attribute for class "%s" must be int ("%s" given).', $attribute, $currentClass, $data), $data, [Type::BUILTIN_TYPE_INT], $context['deserialization_path'] ?? null);
- }
- break;
- case Type::BUILTIN_TYPE_FLOAT:
- if (is_numeric($data)) {
- return (float) $data;
+ // This try-catch should cover all NotNormalizableValueException (and all return branches after the first
+ // exception) so we could try denormalizing all types of an union type. If the target type is not an union
+ // type, we will just re-throw the catched exception.
+ // In the case of no denormalization succeeds with an union type, it will fall back to the default exception
+ // with the acceptable types list.
+ try {
+ // In XML and CSV all basic datatypes are represented as strings, it is e.g. not possible to determine,
+ // if a value is meant to be a string, float, int or a boolean value from the serialized representation.
+ // That's why we have to transform the values, if one of these non-string basic datatypes is expected.
+ if (\is_string($data) && (XmlEncoder::FORMAT === $format || CsvEncoder::FORMAT === $format)) {
+ if ('' === $data) {
+ if (Type::BUILTIN_TYPE_ARRAY === $builtinType = $type->getBuiltinType()) {
+ return [];
}
- switch ($data) {
- case 'NaN':
- return \NAN;
- case 'INF':
- return \INF;
- case '-INF':
- return -\INF;
- default:
- throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the "%s" attribute for class "%s" must be float ("%s" given).', $attribute, $currentClass, $data), $data, [Type::BUILTIN_TYPE_FLOAT], $context['deserialization_path'] ?? null);
+ if ($type->isNullable() && \in_array($builtinType, [Type::BUILTIN_TYPE_BOOL, Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_FLOAT], true)) {
+ return null;
}
+ }
+
+ switch ($builtinType ?? $type->getBuiltinType()) {
+ case Type::BUILTIN_TYPE_BOOL:
+ // according to https://www.w3.org/TR/xmlschema-2/#boolean, valid representations are "false", "true", "0" and "1"
+ if ('false' === $data || '0' === $data) {
+ $data = false;
+ } elseif ('true' === $data || '1' === $data) {
+ $data = true;
+ } else {
+ throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the "%s" attribute for class "%s" must be bool ("%s" given).', $attribute, $currentClass, $data), $data, [Type::BUILTIN_TYPE_BOOL], $context['deserialization_path'] ?? null);
+ }
+ break;
+ case Type::BUILTIN_TYPE_INT:
+ if (ctype_digit($data) || '-' === $data[0] && ctype_digit(substr($data, 1))) {
+ $data = (int) $data;
+ } else {
+ throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the "%s" attribute for class "%s" must be int ("%s" given).', $attribute, $currentClass, $data), $data, [Type::BUILTIN_TYPE_INT], $context['deserialization_path'] ?? null);
+ }
+ break;
+ case Type::BUILTIN_TYPE_FLOAT:
+ if (is_numeric($data)) {
+ return (float) $data;
+ }
+
+ switch ($data) {
+ case 'NaN':
+ return \NAN;
+ case 'INF':
+ return \INF;
+ case '-INF':
+ return -\INF;
+ default:
+ throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the "%s" attribute for class "%s" must be float ("%s" given).', $attribute, $currentClass, $data), $data, [Type::BUILTIN_TYPE_FLOAT], $context['deserialization_path'] ?? null);
+ }
+ }
}
- }
- if (null !== $collectionValueType && Type::BUILTIN_TYPE_OBJECT === $collectionValueType->getBuiltinType()) {
- $builtinType = Type::BUILTIN_TYPE_OBJECT;
- $class = $collectionValueType->getClassName().'[]';
+ if (null !== $collectionValueType && Type::BUILTIN_TYPE_OBJECT === $collectionValueType->getBuiltinType()) {
+ $builtinType = Type::BUILTIN_TYPE_OBJECT;
+ $class = $collectionValueType->getClassName().'[]';
- if (\count($collectionKeyType = $type->getCollectionKeyTypes()) > 0) {
- [$context['key_type']] = $collectionKeyType;
- }
- } elseif ($type->isCollection() && \count($collectionValueType = $type->getCollectionValueTypes()) > 0 && Type::BUILTIN_TYPE_ARRAY === $collectionValueType[0]->getBuiltinType()) {
- // get inner type for any nested array
- [$innerType] = $collectionValueType;
-
- // note that it will break for any other builtinType
- $dimensions = '[]';
- while (\count($innerType->getCollectionValueTypes()) > 0 && Type::BUILTIN_TYPE_ARRAY === $innerType->getBuiltinType()) {
- $dimensions .= '[]';
- [$innerType] = $innerType->getCollectionValueTypes();
- }
+ if (\count($collectionKeyType = $type->getCollectionKeyTypes()) > 0) {
+ [$context['key_type']] = $collectionKeyType;
+ }
+ } elseif ($type->isCollection() && \count($collectionValueType = $type->getCollectionValueTypes()) > 0 && Type::BUILTIN_TYPE_ARRAY === $collectionValueType[0]->getBuiltinType()) {
+ // get inner type for any nested array
+ [$innerType] = $collectionValueType;
+
+ // note that it will break for any other builtinType
+ $dimensions = '[]';
+ while (\count($innerType->getCollectionValueTypes()) > 0 && Type::BUILTIN_TYPE_ARRAY === $innerType->getBuiltinType()) {
+ $dimensions .= '[]';
+ [$innerType] = $innerType->getCollectionValueTypes();
+ }
- if (null !== $innerType->getClassName()) {
- // the builtinType is the inner one and the class is the class followed by []...[]
- $builtinType = $innerType->getBuiltinType();
- $class = $innerType->getClassName().$dimensions;
+ if (null !== $innerType->getClassName()) {
+ // the builtinType is the inner one and the class is the class followed by []...[]
+ $builtinType = $innerType->getBuiltinType();
+ $class = $innerType->getClassName().$dimensions;
+ } else {
+ // default fallback (keep it as array)
+ $builtinType = $type->getBuiltinType();
+ $class = $type->getClassName();
+ }
} else {
- // default fallback (keep it as array)
$builtinType = $type->getBuiltinType();
$class = $type->getClassName();
}
- } else {
- $builtinType = $type->getBuiltinType();
- $class = $type->getClassName();
- }
- $expectedTypes[Type::BUILTIN_TYPE_OBJECT === $builtinType && $class ? $class : $builtinType] = true;
+ $expectedTypes[Type::BUILTIN_TYPE_OBJECT === $builtinType && $class ? $class : $builtinType] = true;
- if (Type::BUILTIN_TYPE_OBJECT === $builtinType) {
- if (!$this->serializer instanceof DenormalizerInterface) {
- throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));
- }
+ if (Type::BUILTIN_TYPE_OBJECT === $builtinType) {
+ if (!$this->serializer instanceof DenormalizerInterface) {
+ throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));
+ }
- $childContext = $this->createChildContext($context, $attribute, $format);
- if ($this->serializer->supportsDenormalization($data, $class, $format, $childContext)) {
- return $this->serializer->denormalize($data, $class, $format, $childContext);
+ $childContext = $this->createChildContext($context, $attribute, $format);
+ if ($this->serializer->supportsDenormalization($data, $class, $format, $childContext)) {
+ return $this->serializer->denormalize($data, $class, $format, $childContext);
+ }
}
- }
- // JSON only has a Number type corresponding to both int and float PHP types.
- // PHP's json_encode, JavaScript's JSON.stringify, Go's json.Marshal as well as most other JSON encoders convert
- // floating-point numbers like 12.0 to 12 (the decimal part is dropped when possible).
- // PHP's json_decode automatically converts Numbers without a decimal part to integers.
- // To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when
- // a float is expected.
- if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && null !== $format && str_contains($format, JsonEncoder::FORMAT)) {
- return (float) $data;
- }
+ // JSON only has a Number type corresponding to both int and float PHP types.
+ // PHP's json_encode, JavaScript's JSON.stringify, Go's json.Marshal as well as most other JSON encoders convert
+ // floating-point numbers like 12.0 to 12 (the decimal part is dropped when possible).
+ // PHP's json_decode automatically converts Numbers without a decimal part to integers.
+ // To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when
+ // a float is expected.
+ if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && null !== $format && str_contains($format, JsonEncoder::FORMAT)) {
+ return (float) $data;
+ }
- if (Type::BUILTIN_TYPE_FALSE === $builtinType && false === $data) {
- return $data;
- }
+ if (Type::BUILTIN_TYPE_FALSE === $builtinType && false === $data) {
+ return $data;
+ }
- if (('is_'.$builtinType)($data)) {
- return $data;
+ if (('is_'.$builtinType)($data)) {
+ return $data;
+ }
+ } catch (NotNormalizableValueException $e) {
+ if (!$isUnionType) {
+ throw $e;
+ }
}
}
@@ -717,7 +729,7 @@ private function getCacheKey(?string $format, array $context)
'context' => $context,
'ignored' => $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES],
]));
- } catch (\Exception $exception) {
+ } catch (\Exception $e) {
// The context cannot be serialized, skip the cache
return false;
}
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php
index 4f3186c30e94b..8b53906c405dc 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php
@@ -29,6 +29,8 @@ final class Php74Full
public array $collection;
public Php74FullWithConstructor $php74FullWithConstructor;
public DummyMessageInterface $dummyMessage;
+ /** @var TestFoo[] $nestedArray */
+ public TestFoo $nestedObject;
}
@@ -38,3 +40,8 @@ public function __construct($constructorArgument)
{
}
}
+
+final class TestFoo
+{
+ public int $int;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index 5fc511dc8a715..28ab8db8c918f 100644
--- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -718,6 +718,38 @@ public function testDeserializeWrappedScalar()
$this->assertSame(42, $serializer->deserialize('{"wrapper": 42}', 'int', 'json', [UnwrappingDenormalizer::UNWRAP_PATH => '[wrapper]']));
}
+ public function testUnionTypeDeserializable()
+ {
+ $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+ $extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
+ $serializer = new Serializer(
+ [
+ new DateTimeNormalizer(),
+ new ObjectNormalizer($classMetadataFactory, null, null, $extractor, new ClassDiscriminatorFromClassMetadata($classMetadataFactory)),
+ ],
+ ['json' => new JsonEncoder()]
+ );
+
+ $actual = $serializer->deserialize('{ "changed": null }', DummyUnionType::class, 'json', [
+ DateTimeNormalizer::FORMAT_KEY => \DateTime::ISO8601,
+ ]);
+
+ $this->assertEquals((new DummyUnionType())->setChanged(null), $actual, 'Union type denormalization first case failed.');
+
+ $actual = $serializer->deserialize('{ "changed": "2022-03-22T16:15:05+0000" }', DummyUnionType::class, 'json', [
+ DateTimeNormalizer::FORMAT_KEY => \DateTime::ISO8601,
+ ]);
+
+ $expectedDateTime = \DateTime::createFromFormat(\DateTime::ISO8601, '2022-03-22T16:15:05+0000');
+ $this->assertEquals((new DummyUnionType())->setChanged($expectedDateTime), $actual, 'Union type denormalization second case failed.');
+
+ $actual = $serializer->deserialize('{ "changed": false }', DummyUnionType::class, 'json', [
+ DateTimeNormalizer::FORMAT_KEY => \DateTime::ISO8601,
+ ]);
+
+ $this->assertEquals(new DummyUnionType(), $actual, 'Union type denormalization third case failed.');
+ }
+
private function serializerWithClassDiscriminator()
{
$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
@@ -739,8 +771,12 @@ public function testDeserializeAndUnwrap()
);
}
- /** @requires PHP 7.4 */
- public function testCollectDenormalizationErrors()
+ /**
+ * @dataProvider provideCollectDenormalizationErrors
+ *
+ * @requires PHP 7.4
+ */
+ public function testCollectDenormalizationErrors(?ClassMetadataFactory $classMetadataFactory)
{
$json = '
{
@@ -764,10 +800,12 @@ public function testCollectDenormalizationErrors()
],
"php74FullWithConstructor": {},
"dummyMessage": {
+ },
+ "nestedObject": {
+ "int": "string"
}
}';
- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
$extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
$serializer = new Serializer(
@@ -777,7 +815,7 @@ public function testCollectDenormalizationErrors()
new DateTimeZoneNormalizer(),
new DataUriNormalizer(),
new UidNormalizer(),
- new ObjectNormalizer($classMetadataFactory, null, null, $extractor, new ClassDiscriminatorFromClassMetadata($classMetadataFactory)),
+ new ObjectNormalizer($classMetadataFactory, null, null, $extractor, $classMetadataFactory ? new ClassDiscriminatorFromClassMetadata($classMetadataFactory) : null),
],
['json' => new JsonEncoder()]
);
@@ -913,22 +951,45 @@ public function testCollectDenormalizationErrors()
'useMessageForUser' => true,
'message' => 'Failed to create object because the object miss the "constructorArgument" property.',
],
+ $classMetadataFactory ?
+ [
+ 'currentType' => 'null',
+ 'expectedTypes' => [
+ 'string',
+ ],
+ 'path' => 'dummyMessage.type',
+ 'useMessageForUser' => false,
+ 'message' => 'Type property "type" not found for the abstract object "Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface".',
+ ] :
+ [
+ 'currentType' => 'array',
+ 'expectedTypes' => [
+ DummyMessageInterface::class,
+ ],
+ 'path' => 'dummyMessage',
+ 'useMessageForUser' => false,
+ 'message' => 'The type of the "dummyMessage" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\Php74Full" must be one of "Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface" ("array" given).',
+ ],
[
- 'currentType' => 'null',
+ 'currentType' => 'string',
'expectedTypes' => [
- 'string',
+ 'int',
],
- 'path' => 'dummyMessage.type',
- 'useMessageForUser' => false,
- 'message' => 'Type property "type" not found for the abstract object "Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface".',
+ 'path' => 'nestedObject[int]',
+ 'useMessageForUser' => true,
+ 'message' => 'The type of the key "int" must be "int" ("string" given).',
],
];
$this->assertSame($expected, $exceptionsAsArray);
}
- /** @requires PHP 7.4 */
- public function testCollectDenormalizationErrors2()
+ /**
+ * @dataProvider provideCollectDenormalizationErrors
+ *
+ * @requires PHP 7.4
+ */
+ public function testCollectDenormalizationErrors2(?ClassMetadataFactory $classMetadataFactory)
{
$json = '
[
@@ -940,13 +1001,12 @@ public function testCollectDenormalizationErrors2()
}
]';
- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
$extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
$serializer = new Serializer(
[
new ArrayDenormalizer(),
- new ObjectNormalizer($classMetadataFactory, null, null, $extractor, new ClassDiscriminatorFromClassMetadata($classMetadataFactory)),
+ new ObjectNormalizer($classMetadataFactory, null, null, $extractor, $classMetadataFactory ? new ClassDiscriminatorFromClassMetadata($classMetadataFactory) : null),
],
['json' => new JsonEncoder()]
);
@@ -999,17 +1059,20 @@ public function testCollectDenormalizationErrors2()
$this->assertSame($expected, $exceptionsAsArray);
}
- /** @requires PHP 8.0 */
- public function testCollectDenormalizationErrorsWithConstructor()
+ /**
+ * @dataProvider provideCollectDenormalizationErrors
+ *
+ * @requires PHP 8.0
+ */
+ public function testCollectDenormalizationErrorsWithConstructor(?ClassMetadataFactory $classMetadataFactory)
{
$json = '{"bool": "bool"}';
- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
$extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
$serializer = new Serializer(
[
- new ObjectNormalizer($classMetadataFactory, null, null, $extractor, new ClassDiscriminatorFromClassMetadata($classMetadataFactory)),
+ new ObjectNormalizer($classMetadataFactory, null, null, $extractor, $classMetadataFactory ? new ClassDiscriminatorFromClassMetadata($classMetadataFactory) : null),
],
['json' => new JsonEncoder()]
);
@@ -1050,6 +1113,14 @@ public function testCollectDenormalizationErrorsWithConstructor()
$this->assertSame($expected, $exceptionsAsArray);
}
+
+ public function provideCollectDenormalizationErrors()
+ {
+ return [
+ [null],
+ [new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()))],
+ ];
+ }
}
class Model
@@ -1116,6 +1187,26 @@ public function __construct($value)
}
}
+class DummyUnionType
+{
+ /**
+ * @var \DateTime|bool|null
+ */
+ public $changed = false;
+
+ /**
+ * @param \DateTime|bool|null
+ *
+ * @return $this
+ */
+ public function setChanged($changed): self
+ {
+ $this->changed = $changed;
+
+ return $this;
+ }
+}
+
class Baz
{
public $list;
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php
index 4d505de0ebf73..a865de1202076 100644
--- a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php
@@ -278,7 +278,7 @@ private function uploadTranslations(int $fileId, string $domain, string $content
* @see https://support.crowdin.com/api/v2/#operation/api.projects.translations.postOnLanguage (Crowdin API)
* @see https://support.crowdin.com/enterprise/api/#operation/api.projects.translations.postOnLanguage (Crowdin Enterprise API)
*/
- return $this->client->request('POST', 'translations/'.$locale, [
+ return $this->client->request('POST', 'translations/'.str_replace('_', '-', $locale), [
'json' => [
'storageId' => $storageId,
'fileId' => $fileId,
@@ -294,7 +294,7 @@ private function exportProjectTranslations(string $languageId, int $fileId): Res
*/
return $this->client->request('POST', 'translations/exports', [
'json' => [
- 'targetLanguageId' => $languageId,
+ 'targetLanguageId' => str_replace('_', '-', $languageId),
'fileIds' => [$fileId],
],
]);
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
index aa8624dd18913..2fd4d33f5cc5e 100644
--- a/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
@@ -217,7 +217,10 @@ public function testCompleteWriteProcessUpdateFiles()
$provider->write($translatorBag);
}
- public function testCompleteWriteProcessAddFileAndUploadTranslations()
+ /**
+ * @dataProvider getResponsesForProcessAddFileAndUploadTranslations
+ */
+ public function testCompleteWriteProcessAddFileAndUploadTranslations(TranslatorBag $translatorBag, string $expectedLocale, string $expectedMessagesTranslationsContent)
{
$this->xliffFileDumper = new XliffFileDumper();
@@ -237,24 +240,6 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations()
-XLIFF;
-
- $expectedMessagesTranslationsContent = <<<'XLIFF'
-
-
-
-
-
-
- a
- trans_fr_a
-
-
-
-
-
XLIFF;
$responses = [
@@ -296,23 +281,15 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations()
return new MockResponse(json_encode(['data' => ['id' => 19]]), ['http_code' => 201]);
},
- 'UploadTranslations' => function (string $method, string $url, array $options = []): ResponseInterface {
+ 'UploadTranslations' => function (string $method, string $url, array $options = []) use ($expectedLocale): ResponseInterface {
$this->assertSame('POST', $method);
- $this->assertSame('https://api.crowdin.com/api/v2/projects/1/translations/fr', $url);
+ $this->assertSame(sprintf('https://api.crowdin.com/api/v2/projects/1/translations/%s', $expectedLocale), $url);
$this->assertSame('{"storageId":19,"fileId":12}', $options['body']);
return new MockResponse();
},
];
- $translatorBag = new TranslatorBag();
- $translatorBag->addCatalogue(new MessageCatalogue('en', [
- 'messages' => ['a' => 'trans_en_a'],
- ]));
- $translatorBag->addCatalogue(new MessageCatalogue('fr', [
- 'messages' => ['a' => 'trans_fr_a'],
- ]));
-
$provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
'auth_bearer' => 'API_TOKEN',
@@ -321,10 +298,69 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations()
$provider->write($translatorBag);
}
+ public function getResponsesForProcessAddFileAndUploadTranslations(): \Generator
+ {
+ $arrayLoader = new ArrayLoader();
+
+ $translatorBagFr = new TranslatorBag();
+ $translatorBagFr->addCatalogue($arrayLoader->load([
+ 'a' => 'trans_en_a',
+ ], 'en'));
+ $translatorBagFr->addCatalogue($arrayLoader->load([
+ 'a' => 'trans_fr_a',
+ ], 'fr'));
+
+ yield [$translatorBagFr, 'fr', <<<'XLIFF'
+
+
+
+
+
+
+ a
+ trans_fr_a
+
+
+
+
+
+XLIFF
+ ];
+
+ $translatorBagEnGb = new TranslatorBag();
+ $translatorBagEnGb->addCatalogue($arrayLoader->load([
+ 'a' => 'trans_en_a',
+ ], 'en'));
+ $translatorBagEnGb->addCatalogue($arrayLoader->load([
+ 'a' => 'trans_en_gb_a',
+ ], 'en_GB'));
+
+ yield [$translatorBagEnGb, 'en-GB', <<<'XLIFF'
+
+
+
+
+
+
+ a
+ trans_en_gb_a
+
+
+
+
+
+XLIFF
+ ];
+ }
+
/**
* @dataProvider getResponsesForOneLocaleAndOneDomain
*/
- public function testReadForOneLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag)
+ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag, string $expectedTargetLanguageId)
{
$responses = [
'listFiles' => function (string $method, string $url): ResponseInterface {
@@ -340,10 +376,10 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
],
]));
},
- 'exportProjectTranslations' => function (string $method, string $url, array $options = []): ResponseInterface {
+ 'exportProjectTranslations' => function (string $method, string $url, array $options = []) use ($expectedTargetLanguageId): ResponseInterface {
$this->assertSame('POST', $method);
$this->assertSame('https://api.crowdin.com/api/v2/projects/1/translations/exports', $url);
- $this->assertSame('{"targetLanguageId":"fr","fileIds":[12]}', $options['body']);
+ $this->assertSame(sprintf('{"targetLanguageId":"%s","fileIds":[12]}', $expectedTargetLanguageId), $options['body']);
return new MockResponse(json_encode(['data' => ['url' => 'https://file.url']]));
},
@@ -401,7 +437,37 @@ public function getResponsesForOneLocaleAndOneDomain(): \Generator
XLIFF
,
- $expectedTranslatorBagFr,
+ $expectedTranslatorBagFr, 'fr',
+ ];
+
+ $expectedTranslatorBagEnUs = new TranslatorBag();
+ $expectedTranslatorBagEnUs->addCatalogue($arrayLoader->load([
+ 'index.hello' => 'Hello',
+ 'index.greetings' => 'Welcome, {firstname}!',
+ ], 'en_GB'));
+
+ yield ['en_GB', 'messages', <<<'XLIFF'
+
+
+
+
+
+
+ index.hello
+ Hello
+
+
+ index.greetings
+ Welcome, {firstname}!
+
+
+
+
+XLIFF
+ ,
+ $expectedTranslatorBagEnUs, 'en-GB',
];
}
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
index 8709a8969ce20..ce1eee839366a 100644
--- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
+++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
@@ -207,6 +207,7 @@ private function translateAssets(array $translations, string $locale): void
foreach ($translations as $id => $message) {
$responses[$id] = $this->client->request('POST', sprintf('translations/%s/%s', rawurlencode($id), rawurlencode($locale)), [
'body' => $message,
+ 'headers' => ['Content-Type' => 'text/plain'],
]);
}
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php b/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php
index a202bc65caa5f..58b8fa02bdc1b 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php
@@ -82,8 +82,8 @@ public function testIntersect()
$this->assertEquals([
'en' => [
- 'domain1' => ['bar' => 'bar'],
- 'domain2' => ['qux' => 'qux'],
+ 'domain1' => ['foo' => 'foo'],
+ 'domain2' => ['baz' => 'baz'],
],
], $this->getAllMessagesFromTranslatorBag($bagResult));
}
diff --git a/src/Symfony/Component/Translation/TranslatorBag.php b/src/Symfony/Component/Translation/TranslatorBag.php
index 6d98455e5b78a..555a9e8147fd2 100644
--- a/src/Symfony/Component/Translation/TranslatorBag.php
+++ b/src/Symfony/Component/Translation/TranslatorBag.php
@@ -94,7 +94,10 @@ public function intersect(TranslatorBagInterface $intersectBag): self
$obsoleteCatalogue = new MessageCatalogue($locale);
foreach ($operation->getDomains() as $domain) {
- $obsoleteCatalogue->add($operation->getObsoleteMessages($domain), $domain);
+ $obsoleteCatalogue->add(
+ array_diff($operation->getMessages($domain), $operation->getNewMessages($domain)),
+ $domain
+ );
}
$diff->addCatalogue($obsoleteCatalogue);
diff --git a/src/Symfony/Component/Validator/Constraints/DivisibleByValidator.php b/src/Symfony/Component/Validator/Constraints/DivisibleByValidator.php
index 53b8d38930c90..de7743010b354 100644
--- a/src/Symfony/Component/Validator/Constraints/DivisibleByValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/DivisibleByValidator.php
@@ -42,6 +42,12 @@ protected function compareValues($value1, $value2)
if (!$remainder = fmod($value1, $value2)) {
return true;
}
+ if (\is_float($value2) && \INF !== $value2) {
+ $quotient = $value1 / $value2;
+ $rounded = round($quotient);
+
+ return sprintf('%.12e', $quotient) === sprintf('%.12e', $rounded);
+ }
return sprintf('%.12e', $value2) === sprintf('%.12e', $remainder);
}
diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
index e28473ac8462e..b5a446ea2d2a0 100644
--- a/src/Symfony/Component/Validator/Constraints/File.php
+++ b/src/Symfony/Component/Validator/Constraints/File.php
@@ -168,7 +168,7 @@ private function normalizeBinaryFormat($maxSize)
$this->maxSize = $matches[1] * $factors[$unit = strtolower($matches[2])];
$this->binaryFormat = $this->binaryFormat ?? (2 === \strlen($unit));
} else {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $this->maxSize));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $maxSize));
}
}
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php
index 7612ada32b530..4ce2723c0d845 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DivisibleByValidatorTest.php
@@ -46,6 +46,18 @@ public function provideValidComparisons(): array
[0, 3.1415],
[42, 42],
[42, 21],
+ [10.12, 0.01],
+ [10.12, 0.001],
+ [1.133, 0.001],
+ [1.1331, 0.0001],
+ [1.13331, 0.00001],
+ [1.13331, 0.000001],
+ [1, 0.1],
+ [1, 0.01],
+ [1, 0.001],
+ [1, 0.0001],
+ [1, 0.00001],
+ [1, 0.000001],
[3.25, 0.25],
['100', '10'],
[4.1, 0.1],
@@ -74,6 +86,7 @@ public function provideInvalidComparisons(): array
[10, '10', 0, '0', 'int'],
[42, '42', \INF, 'INF', 'float'],
[4.15, '4.15', 0.1, '0.1', 'float'],
+ [10.123, '10.123', 0.01, '0.01', 'float'],
['22', '"22"', '10', '"10"', 'string'],
];
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
index 57a2729384c01..327cb963b33bc 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -526,5 +526,14 @@ public function uploadedFileErrorProvider()
return $tests;
}
+ public function testNegativeMaxSize()
+ {
+ $this->expectException(ConstraintDefinitionException::class);
+ $this->expectExceptionMessage('"-1" is not a valid maximum size.');
+
+ $file = new File();
+ $file->maxSize = -1;
+ }
+
abstract protected function getFile($filename);
}
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
index 95f6d79dc506c..9c041605cf688 100644
--- a/src/Symfony/Component/VarExporter/Internal/Exporter.php
+++ b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -138,7 +138,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
$i = 0;
$n = (string) $name;
if ('' === $n || "\0" !== $n[0]) {
- $c = 'stdClass';
+ $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
} elseif ('*' === $n[1]) {
$n = substr($n, 3);
$c = $reflector->getProperty($n)->class;
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/FooReadonly.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/FooReadonly.php
new file mode 100644
index 0000000000000..8e41de95958bc
--- /dev/null
+++ b/src/Symfony/Component/VarExporter/Tests/Fixtures/FooReadonly.php
@@ -0,0 +1,21 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures;
+
+class FooReadonly
+{
+ public function __construct(
+ public readonly string $name,
+ public readonly string $value,
+ ) {
+ }
+}
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php
index 7b217c5fb21b0..64c39f75faa8b 100644
--- a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php
+++ b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php
@@ -7,7 +7,7 @@
clone ($p['DateTimeZone'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('DateTimeZone')),
clone ($p['DateInterval'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('DateInterval')),
], [
- 4 => 'O:10:"DatePeriod":6:{s:5:"start";O:8:"DateTime":3:{s:4:"date";s:26:"2012-07-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";b:0;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;}',
+ 4 => 'O:10:"DatePeriod":6:{s:5:"start";O:8:"DateTime":3:{s:4:"date";s:26:"2009-10-11 00:00:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:12:"Europe/Paris";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";i:7;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;}',
]),
null,
[
@@ -60,7 +60,7 @@
3 => 0,
],
'days' => [
- 3 => false,
+ 3 => 7,
],
'special_type' => [
3 => 0,
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php
index 1de8fa03f0919..e9f41f9ade34c 100644
--- a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php
+++ b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php
@@ -5,8 +5,8 @@
'O:8:"DateTime":3:{s:4:"date";s:26:"1970-01-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}',
'O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1970-01-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}',
'O:12:"DateTimeZone":2:{s:13:"timezone_type";i:3;s:8:"timezone";s:12:"Europe/Paris";}',
- 'O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";b:0;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}',
- 'O:10:"DatePeriod":6:{s:5:"start";O:8:"DateTime":3:{s:4:"date";s:26:"2012-07-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";b:0;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;}',
+ 'O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";i:7;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}',
+ 'O:10:"DatePeriod":6:{s:5:"start";O:8:"DateTime":3:{s:4:"date";s:26:"2009-10-11 00:00:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:12:"Europe/Paris";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";i:7;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;}',
]),
null,
[],
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/readonly.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/readonly.php
new file mode 100644
index 0000000000000..3b3db27305859
--- /dev/null
+++ b/src/Symfony/Component/VarExporter/Tests/Fixtures/readonly.php
@@ -0,0 +1,20 @@
+ [
+ 'name' => [
+ 'k',
+ ],
+ 'value' => [
+ 'v',
+ ],
+ ],
+ ],
+ $o[0],
+ []
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
index f87e4e9b01d1e..f90737da2e8cf 100644
--- a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
+++ b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -16,6 +16,7 @@
use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
use Symfony\Component\VarExporter\Internal\Registry;
+use Symfony\Component\VarExporter\Tests\Fixtures\FooReadonly;
use Symfony\Component\VarExporter\Tests\Fixtures\FooSerializable;
use Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum;
use Symfony\Component\VarExporter\Tests\Fixtures\MySerializable;
@@ -132,9 +133,9 @@ public function provideExport()
yield ['datetime', [
\DateTime::createFromFormat('U', 0),
\DateTimeImmutable::createFromFormat('U', 0),
- new \DateTimeZone('Europe/Paris'),
- new \DateInterval('P7D'),
- new \DatePeriod('R4/2012-07-01T00:00:00Z/P7D'),
+ $tz = new \DateTimeZone('Europe/Paris'),
+ $interval = ($start = new \DateTime('2009-10-11', $tz))->diff(new \DateTime('2009-10-18', $tz)),
+ new \DatePeriod($start, $interval, 4),
]];
$value = \PHP_VERSION_ID >= 70406 ? new ArrayObject() : new \ArrayObject();
@@ -244,9 +245,12 @@ public function provideExport()
yield ['php74-serializable', new Php74Serializable()];
- if (\PHP_VERSION_ID >= 80100) {
- yield ['unit-enum', [FooUnitEnum::Bar], true];
+ if (\PHP_VERSION_ID < 80100) {
+ return;
}
+
+ yield ['unit-enum', [FooUnitEnum::Bar], true];
+ yield ['readonly', new FooReadonly('k', 'v')];
}
public function testUnicodeDirectionality()
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
index faa01fb69f2c9..efb57bc1fe06a 100644
--- a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
+++ b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -954,6 +954,16 @@ public function testProxy()
$body = $response->toArray();
$this->assertSame('Basic Zm9vOmI9YXI=', $body['HTTP_PROXY_AUTHORIZATION']);
+
+ $_SERVER['http_proxy'] = 'http://localhost:8057';
+ try {
+ $response = $client->request('GET', 'http://localhost:8057/');
+ $body = $response->toArray();
+ $this->assertSame('localhost:8057', $body['HTTP_HOST']);
+ $this->assertMatchesRegularExpression('#^http://(localhost|127\.0\.0\.1):8057/$#', $body['REQUEST_URI']);
+ } finally {
+ unset($_SERVER['http_proxy']);
+ }
}
public function testNoProxy()
diff --git a/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php b/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
index 46cd007b75c35..f7fc2df6a2fd9 100644
--- a/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
+++ b/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
@@ -36,7 +36,7 @@ public static function getSubscribedServices(): array
return $services;
}
- $services = \is_callable(['parent', __FUNCTION__]) ? parent::getSubscribedServices() : [];
+ $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
$attributeOptIn = false;
if (\PHP_VERSION_ID >= 80000) {
@@ -106,7 +106,7 @@ public function setContainer(ContainerInterface $container)
{
$this->container = $container;
- if (\is_callable(['parent', __FUNCTION__])) {
+ if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
return parent::setContainer($container);
}
diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
index fa7c98cad53af..8d0dc467642bc 100644
--- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
+++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
@@ -55,6 +55,32 @@ public function testSetContainerIsCalledOnParent()
$this->assertSame($container, (new TestService())->setContainer($container));
}
+ public function testParentNotCalledIfHasMagicCall()
+ {
+ $container = new class([]) implements ContainerInterface {
+ use ServiceLocatorTrait;
+ };
+ $service = new class() extends ParentWithMagicCall {
+ use ServiceSubscriberTrait;
+ };
+
+ $this->assertNull($service->setContainer($container));
+ $this->assertSame([], $service::getSubscribedServices());
+ }
+
+ public function testParentNotCalledIfNoParent()
+ {
+ $container = new class([]) implements ContainerInterface {
+ use ServiceLocatorTrait;
+ };
+ $service = new class() {
+ use ServiceSubscriberTrait;
+ };
+
+ $this->assertNull($service->setContainer($container));
+ $this->assertSame([], $service::getSubscribedServices());
+ }
+
/**
* @requires PHP 8
* @group legacy
@@ -118,6 +144,19 @@ public function aChildService(): Service3
}
}
+class ParentWithMagicCall
+{
+ public function __call($method, $args)
+ {
+ throw new \BadMethodCallException('Should not be called.');
+ }
+
+ public static function __callStatic($method, $args)
+ {
+ throw new \BadMethodCallException('Should not be called.');
+ }
+}
+
class Service3
{
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy