Skip to content

Commit 11ab05d

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (27 commits) feat: add completion for DebugAutowiring search argument [Routing] Add support for aliasing routes [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS [Console] Open CompleteCommand for custom outputs [Intl] Update the ICU data to 70.1 [Messenger] Add completion for failed messages commands. Fix tests Fixing missing full_stack variable that's needed by toolbar.html.twig [PropertyInfo] Bump phpstan/phpdoc-parser [Security] Backport type fixes [VarExporter] escape unicode chars involved in directionality [Framework] Add completion to debug:container [Messenger] Add completion to command messenger:consume [Intl] Update the ICU data to 70.1 Fix more generic types Default access_decision_manager.strategy option with merge. Fix typos Update validators.ca.xlf Add missing Validator translations for Estonian ... Signed-off-by: Alexander M. Turek <me@derrabus.de>
2 parents bc5de5a + 42ecb78 commit 11ab05d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

DataCollector/ConfigDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function isSymfonyLts(): bool
128128
}
129129

130130
/**
131-
* Returns the human redable date when this Symfony version ends its
131+
* Returns the human readable date when this Symfony version ends its
132132
* maintenance period.
133133
*/
134134
public function getSymfonyEom(): string
@@ -137,7 +137,7 @@ public function getSymfonyEom(): string
137137
}
138138

139139
/**
140-
* Returns the human redable date when this Symfony version reaches its
140+
* Returns the human readable date when this Symfony version reaches its
141141
* "end of life" and won't receive bugs or security fixes.
142142
*/
143143
public function getSymfonyEol(): string

Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class_exists(ConfigCache::class);
5858
abstract class Kernel implements KernelInterface, RebootableInterface, TerminableInterface
5959
{
6060
/**
61-
* @var BundleInterface[]
61+
* @var array<string, BundleInterface>
6262
*/
6363
protected $bundles = [];
6464

KernelInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ interface KernelInterface extends HttpKernelInterface
2727
/**
2828
* Returns an array of bundles to register.
2929
*
30-
* @return iterable<BundleInterface>
30+
* @return iterable<mixed, BundleInterface>
3131
*/
3232
public function registerBundles(): iterable;
3333

@@ -51,7 +51,7 @@ public function shutdown();
5151
/**
5252
* Gets the registered bundle instances.
5353
*
54-
* @return BundleInterface[]
54+
* @return array<string, BundleInterface>
5555
*/
5656
public function getBundles(): array;
5757

0 commit comments

Comments
 (0)