Skip to content

Commit 396e6ca

Browse files
minor #33264 [4.4] Add return types on internal|final|private methods (bis) (nicolas-grekas)
This PR was merged into the 4.4 branch. Discussion ---------- [4.4] Add return types on internal|final|private methods (bis) | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Found while working on #33259 `: self` is used for final methods only. I'd have preferred using `: object` but that's not possible on PHP 7.1 Commits ------- 23faee406f [4.4] Add return types on internal|final|private methods (bis)
2 parents c999d54 + e2582ef commit 396e6ca

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

ChildDefinition.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ public function replaceArgument($index, $value)
109109
/**
110110
* @internal
111111
*/
112-
public function setAutoconfigured($autoconfigured)
112+
public function setAutoconfigured($autoconfigured): self
113113
{
114114
throw new BadMethodCallException('A ChildDefinition cannot be autoconfigured.');
115115
}
116116

117117
/**
118118
* @internal
119119
*/
120-
public function setInstanceofConditionals(array $instanceof)
120+
public function setInstanceofConditionals(array $instanceof): self
121121
{
122122
throw new BadMethodCallException('A ChildDefinition cannot have instanceof conditionals set on it.');
123123
}

Compiler/MergeExtensionConfigurationPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function freezeAfterProcessing(Extension $extension, ContainerBuilder $co
137137
/**
138138
* {@inheritdoc}
139139
*/
140-
public function getEnvPlaceholders()
140+
public function getEnvPlaceholders(): array
141141
{
142142
return null !== $this->processedEnvPlaceholders ? $this->processedEnvPlaceholders : parent::getEnvPlaceholders();
143143
}
@@ -167,7 +167,7 @@ public function __construct(ExtensionInterface $extension, ParameterBagInterface
167167
/**
168168
* {@inheritdoc}
169169
*/
170-
public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
170+
public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): self
171171
{
172172
throw new LogicException(sprintf('You cannot add compiler pass "%s" from extension "%s". Compiler passes must be registered before the container is compiled.', \get_class($pass), $this->extensionClass));
173173
}

Loader/Configurator/DefaultsConfigurator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function __construct(ServicesConfigurator $parent, Definition $definition
4242
*
4343
* @throws InvalidArgumentException when an invalid tag name or attribute is provided
4444
*/
45-
final public function tag(string $name, array $attributes = [])
45+
final public function tag(string $name, array $attributes = []): self
4646
{
4747
if ('' === $name) {
4848
throw new InvalidArgumentException('The tag name in "_defaults" must be a non-empty string.');

Loader/Configurator/ParametersConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct(ContainerBuilder $container)
3232
*
3333
* @return $this
3434
*/
35-
final public function set(string $name, $value)
35+
final public function set(string $name, $value): self
3636
{
3737
$this->container->setParameter($name, static::processValue($value, true));
3838

@@ -44,7 +44,7 @@ final public function set(string $name, $value)
4444
*
4545
* @return $this
4646
*/
47-
final public function __invoke(string $name, $value)
47+
final public function __invoke(string $name, $value): self
4848
{
4949
return $this->set($name, $value);
5050
}

Loader/Configurator/ReferenceConfigurator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct(string $id)
3232
/**
3333
* @return $this
3434
*/
35-
final public function ignoreOnInvalid()
35+
final public function ignoreOnInvalid(): self
3636
{
3737
$this->invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
3838

@@ -42,7 +42,7 @@ final public function ignoreOnInvalid()
4242
/**
4343
* @return $this
4444
*/
45-
final public function nullOnInvalid()
45+
final public function nullOnInvalid(): self
4646
{
4747
$this->invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
4848

@@ -52,7 +52,7 @@ final public function nullOnInvalid()
5252
/**
5353
* @return $this
5454
*/
55-
final public function ignoreOnUninitialized()
55+
final public function ignoreOnUninitialized(): self
5656
{
5757
$this->invalidBehavior = ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE;
5858

Tests/Fixtures/ScalarFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ final class ScalarFactory
77
/**
88
* @return string
99
*/
10-
public static function getSomeValue()
10+
public static function getSomeValue(): string
1111
{
1212
return 'some value';
1313
}

0 commit comments

Comments
 (0)