Skip to content

Commit 5eb8777

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.0' into 6.1
* 6.0: [6.0] cs fixes [5.4] cs fixes [5.3] cs fixes [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes fix merge Remove pointless assignment [HttpClient] Fix tracing requests made after calling withOptions() [Cache] disable lock on CLI Revert "feature symfony#41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)" [HttpKernel] fix how configuring log-level and status-code by exception works [VarDumper] add more "transient-on-macos" groups
2 parents b2e7fcd + d5534b0 commit 5eb8777

File tree

81 files changed

+193
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+193
-202
lines changed

‎.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
'@Symfony' => true,
1212
'@Symfony:risky' => true,
1313
'protected_to_private' => false,
14+
'native_constant_invocation' => ['strict' => false],
1415
'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false],
1516
'modernize_strpos' => true,
1617
])

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ protected function setMappingDriverConfig(array $mappingConfig, string $mappingN
134134
* If this is a bundle controlled mapping all the missing information can be autodetected by this method.
135135
*
136136
* Returns false when autodetection failed, an array of the completed information otherwise.
137-
*
138-
* @return array|false
139137
*/
140138
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, string $bundleDir = null): array|false
141139
{

‎src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
4949
$className = $metadata->getClassName();
5050
try {
5151
$doctrineMetadata = $this->entityManager->getClassMetadata($className);
52-
} catch (MappingException | OrmMappingException $exception) {
52+
} catch (MappingException|OrmMappingException $exception) {
5353
return false;
5454
}
5555

‎src/Symfony/Bridge/Twig/UndefinedCallableHandler.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ class UndefinedCallableHandler
6868
'workflow' => 'enable "framework.workflows"',
6969
];
7070

71-
/**
72-
* @return TwigFilter|false
73-
*/
7471
public static function onUndefinedFilter(string $name): TwigFilter|false
7572
{
7673
if (!isset(self::FILTER_COMPONENTS[$name])) {
@@ -80,9 +77,6 @@ public static function onUndefinedFilter(string $name): TwigFilter|false
8077
throw new SyntaxError(self::onUndefined($name, 'filter', self::FILTER_COMPONENTS[$name]));
8178
}
8279

83-
/**
84-
* @return TwigFunction|false
85-
*/
8680
public static function onUndefinedFunction(string $name): TwigFunction|false
8781
{
8882
if (!isset(self::FUNCTION_COMPONENTS[$name])) {

‎src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
class WorkflowDumpCommand extends Command
3737
{
3838
/**
39-
* string is the service id
39+
* string is the service id.
40+
*
4041
* @var array<string, Definition>
4142
*/
4243
private array $workflows = [];

‎src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
7070

7171
/**
7272
* Gets a container parameter by its name.
73-
*
74-
* @return array|bool|float|int|string|null
7573
*/
7674
protected function getParameter(string $name): array|bool|float|int|string|null
7775
{

‎src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ public function getKernel(): KernelInterface
6262

6363
/**
6464
* Gets the profile associated with the current Response.
65-
*
66-
* @return HttpProfile|false|null
6765
*/
6866
public function getProfile(): HttpProfile|false|null
6967
{

‎src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ public function getParameterBag(): ParameterBagInterface
6363

6464
/**
6565
* {@inheritdoc}
66-
*
67-
* @return array|bool|float|int|string|null
6866
*/
6967
public function getParameter(string $name): array|bool|float|int|string|null
7068
{

‎src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ public function collect(Request $request, Response $response, \Throwable $except
185185
'authenticators' => $firewallConfig->getAuthenticators(),
186186
];
187187

188-
189188
// generate exit impersonation path from current request
190189
if ($this->data['impersonated'] && null !== $switchUserConfig = $firewallConfig->getSwitchUser()) {
191190
$exitPath = $request->getRequestUri();

‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static function ($deferred, $namespace, &$expiredIds, $getId, $defaultLifetime)
7474
$key = (string) $key;
7575
if (null === $item->expiry) {
7676
$ttl = 0 < $defaultLifetime ? $defaultLifetime : 0;
77-
} elseif (0 === $item->expiry) {
77+
} elseif (!$item->expiry) {
7878
$ttl = 0;
7979
} elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
8080
$expiredIds[] = $getId($key);

0 commit comments

Comments
 (0)
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