Skip to content

Commit 31f22b8

Browse files
Merge branch '7.1' into 7.2
* 7.1: Removed body size limit prevent failures around not existing TypeInfo classes fix version check to include dev versions
2 parents f1c45ad + 4e1cf89 commit 31f22b8

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

src/Symfony/Component/HttpClient/AmpHttpClient.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public function request(string $method, string $url, array $options = []): Respo
125125
}
126126

127127
$request = new Request(implode('', $url), $method);
128+
$request->setBodySizeLimit(0);
128129

129130
if ($options['http_version']) {
130131
$request->setProtocolVersions(match ((float) $options['http_version']) {

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public function __construct(array $options, \Redis|Relay|\RedisCluster|null $red
130130
}
131131

132132
try {
133-
if (\extension_loaded('redis') && version_compare(phpversion('redis'), '6.0.0', '>=')) {
133+
if (\extension_loaded('redis') && version_compare(phpversion('redis'), '6.0.0-dev', '>=')) {
134134
$params = [
135135
'host' => $host,
136136
'port' => $port,

src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ private function getType(string $currentClass, string $attribute): Type|array|nu
947947
*/
948948
private function getPropertyType(string $className, string $property): Type|array|null
949949
{
950-
if (method_exists($this->propertyTypeExtractor, 'getType')) {
950+
if (class_exists(Type::class) && method_exists($this->propertyTypeExtractor, 'getType')) {
951951
return $this->propertyTypeExtractor->getType($className, $property);
952952
}
953953

src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
172172
*/
173173
private function getPropertyTypes(string $className, string $property): TypeInfoType|array|null
174174
{
175-
if (method_exists($this->typeExtractor, 'getType')) {
175+
if (class_exists(TypeInfoType::class) && method_exists($this->typeExtractor, 'getType')) {
176176
return $this->typeExtractor->getType($className, $property);
177177
}
178178

0 commit comments

Comments
 (0)