Skip to content

Commit 7d593ba

Browse files
Merge branch '4.4'
* 4.4: [travis] Fix build-packages script Add types to constructors and private/final/internal methods (Batch III) [HttpClient] Async HTTPlug client [Messenger] Allow to configure the db index on Redis transport [HttpClient] bugfix exploding values of headers [VarDumper] Made all casters final [VarDumper] Added a support for casting Ramsey/Uuid Remove useless testCanCheckIfTerminalIsInteractive test case [Validator] Add the missing translations for the Thai (\"th\") locale [Routing] gracefully handle docref_root ini setting [Validator] Fix ValidValidator group cascading usage
2 parents 2bb2d89 + ba09ebf commit 7d593ba

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Command/ContainerDebugCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ protected function getContainerBuilder(): ContainerBuilder
233233
return $this->containerBuilder = $container;
234234
}
235235

236-
private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden)
236+
private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden): string
237237
{
238238
$name = ltrim($name, '\\');
239239

@@ -253,7 +253,7 @@ private function findProperServiceName(InputInterface $input, SymfonyStyle $io,
253253
return $io->choice('Select one of the following services to display its information', $matchingServices);
254254
}
255255

256-
private function findServiceIdsContaining(ContainerBuilder $builder, string $name, bool $showHidden)
256+
private function findServiceIdsContaining(ContainerBuilder $builder, string $name, bool $showHidden): array
257257
{
258258
$serviceIds = $builder->getServiceIds();
259259
$foundServiceIds = $foundServiceIdsIgnoringBackslashes = [];
@@ -275,7 +275,7 @@ private function findServiceIdsContaining(ContainerBuilder $builder, string $nam
275275
/**
276276
* @internal
277277
*/
278-
public function filterToServiceTypes($serviceId)
278+
public function filterToServiceTypes(string $serviceId): bool
279279
{
280280
// filter out things that could not be valid class names
281281
if (!preg_match('/(?(DEFINE)(?<V>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+))^(?&V)(?:\\\\(?&V))*+(?: \$(?&V))?$/', $serviceId)) {

Controller/AbstractController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
6262
* @internal
6363
* @required
6464
*/
65-
public function setContainer(ContainerInterface $container)
65+
public function setContainer(ContainerInterface $container): ?ContainerInterface
6666
{
6767
$previous = $this->container;
6868
$this->container = $container;

0 commit comments

Comments
 (0)