8000 Add types to roting and DI configuration traits. · symfony/symfony@1ca30c9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1ca30c9

Browse files
derrabusderrabus
committed
Add types to roting and DI configuration traits.
1 parent 8073b8a commit 1ca30c9

20 files changed

+34
-45
lines changed

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AbstractTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait AbstractTrait
1919
*
2020
* @return $this
2121
*/
22-
final public function abstract(bool $abstract = true)
22+
final public function abstract(bool $abstract = true): self
2323
{
2424
$this->definition->setAbstract($abstract);
2525

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ArgumentTrait.php

Lines changed: 2 additions & 4 deletions
A3E2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ trait ArgumentTrait
1616
/**
1717
* Sets the arguments to pass to the service constructor/factory method.
1818
*
19-
* @param array $arguments An array of arguments
20-
*
2119
* @return $this
2220
*/
23-
final public function args(array $arguments)
21+
final public function args(array $arguments): self
2422
{
2523
$this->definition->setArguments(static::processValue($arguments, true));
2624

@@ -35,7 +33,7 @@ final public function args(array $arguments)
3533
*
3634
* @return $this
3735
*/
38-
final public function arg($key, $value)
36+
final public function arg($key, $value): self
3937
{
4038
$this->definition->setArgument($key, static::processValue($value, true));
4139

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutoconfigureTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait AutoconfigureTrait
2323
*
2424
* @throws InvalidArgumentException when a parent is already set
2525
*/
26-
final public function autoconfigure(bool $autoconfigured = true)
26+
final public function autoconfigure(bool $autoconfigured = true): self
2727
{
2828
if ($autoconfigured && $this->definition instanceof ChildDefinition) {
2929
throw new InvalidArgumentException(sprintf('The service "%s" cannot have a "parent" and also have "autoconfigure". Try disabling autoconfiguration for the service.', $this->id));

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/AutowireTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait AutowireTrait
1818
*
1919
* @return $this
2020
*/
21-
final public function autowire(bool $autowired = true)
21+
final public function autowire(bool $autowired = true): self
2222
{
2323
$this->definition->setAutowired($autowired);
2424

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ trait BindTrait
3131
*
3232
* @return $this
3333
*/
34-
final public function bind($nameOrFqcn, $valueOrRef)
34+
final public function bind(string $nameOrFqcn, $valueOrRef): self
3535
{
3636
$valueOrRef = static::processValue($valueOrRef, true);
3737
if (!preg_match('/^(?:(?:array|bool|float|int|string)[ \t]*+)?\$/', $nameOrFqcn) && !$valueOrRef instanceof Reference) {

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/CallTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ trait CallTrait
2525
*
2626
* @throws InvalidArgumentException on empty $method param
2727
*/
28-
final public function call($method, array $arguments = [])
28+
final public function call(string $method, array $arguments = []): self
2929
{
3030
$this->definition->addMethodCall($method, static::processValue($arguments, true));
3131

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ClassTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait ClassTrait
1818
*
1919
* @return $this
2020
*/
21-
final public function class($class)
21+
final public function class(?string $class): self
2222
{
2323
$this->definition->setClass($class);
2424

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConfiguratorTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trait ConfiguratorTrait
2020
*
2121
* @return $this
2222
*/
23-
final public function configurator($configurator)
23+
final public function configurator($configurator): self
2424
{
2525
$this->definition->setConfigurator(static::processValue($configurator, true));
2626

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ trait DecorateTrait
1818
/**
1919
* Sets the service that this service is decorating.
2020
*
21-
* @param string|null $id The decorated service id, use null to remove decoration
22-
* @param string|null $renamedId The new decorated service id
23-
* @param int $priority The priority of decoration
21+
* @param string|null $id The decorated service id, use null to remove decoration
2422
*
2523
* @return $this
2624
*
2725
* @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
2826
*/
29-
final public function decorate($id, $renamedId = null, $priority = 0)
27+
final public function decorate(?string $id, string $renamedId = null, int $priority = 0): self
3028
{
3129
$this->definition->setDecoratedService($id, $renamedId, $priority);
3230

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DeprecateTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trait DeprecateTrait
2424
*
2525
* @throws InvalidArgumentException when the message template is invalid
2626
*/
27-
final public function deprecate($template = null)
27+
final public function deprecate(string $template = null): self
2828
{
2929
$this->definition->setDeprecated(true, $template);
3030

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FactoryTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ trait FactoryTrait
2222
*
2323
* @return $this
2424
*/
25-
final public function factory($factory)
25+
final public function factory($factory): self
2626
{
2727
if (\is_string($factory) && 1 === substr_count($factory, ':')) {
2828
$factoryParts = explode(':', $factory);

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FileTrait.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ trait FileTrait
1616
/**
1717
* Sets a file to require before creating the service.
1818
*
19-
* @param string $file A full pathname to include
20-
*
2119
* @return $this
2220
*/
23-
final public function file($file)
21+
final public function file(string $file): self
2422
{
2523
$this->definition->setFile($file);
2624

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/LazyTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trait LazyTrait
2020
*
2121
* @return $this
2222
*/
23-
final public function lazy($lazy = true)
23+
final public function lazy($lazy = true): self
2424
{
2525
$this->definition->setLazy((bool) $lazy);
2626
if (\is_string($lazy)) {

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ParentTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait ParentTrait
2323
*
2424
* @throws InvalidArgumentException when parent cannot be set
2525
*/
26-
final public function parent(string $parent)
26+
final public function parent(string $parent): self
2727
{
2828
if (!$this->allowParent) {
2929
throw new InvalidArgumentException(sprintf('A parent cannot be defined when either "_instanceof" or "_defaults" are also defined for service prototype "%s".', $this->id));

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PropertyTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait PropertyTrait
1818
*
1919
* @return $this
2020
*/
21-
final public function property(string $name, $value)
21+
final public function property(string $name, $value): self
2222
{
2323
$this->definition->setProperty($name, static::processValue($value, true));
2424

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/PublicTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ trait PublicTrait
1616
/**
1717
* @return $this
1818
*/
19-
final public function public()
19+
final public function public(): self
2020
{
2121
$this->definition->setPublic(true);
2222

@@ -26,7 +26,7 @@ final public function public()
2626
/**
2727
* @return $this
2828
*/
29-
final public function private()
29+
final public function private(): self
3030
{
3131
$this->definition->setPublic(false);
3232

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ShareTrait.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ trait ShareTrait
1616
/**
1717
* Sets if the service must be shared or not.
1818
*
19-
* @param bool $shared Whether the service must be shared or not
20-
*
2119
* @return $this
2220
*/
23-
final public function share($shared = true)
21+
final public function share(bool $shared = true): self
2422
{
2523
$this->definition->setShared($shared);
2624

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/SyntheticTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait SyntheticTrait
1919
*
2020
* @return $this
2121
*/
22-
final public function synthetic(bool $synthetic = true)
22+
final public function synthetic(bool $synthetic = true): self
2323
{
2424
$this->definition->setSynthetic($synthetic);
2525

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/TagTrait.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ trait TagTrait
1818
/**
1919
* Adds a tag for this definition.
2020
*
21-
* @param string $name The tag name
22-
* @param array $attributes An array of attributes
23-
*
2421
* @return $this
2522
*/
26-
final public function tag($name, array $attributes = [])
23+
final public function tag(string $name, array $attributes = []): self
2724
{
28-
if (!\is_string($name) || '' === $name) {
25+
if ('' === $name) {
2926
throw new InvalidArgumentException(sprintf('The tag name for service "%s" must be a non-empty string.', $this->id));
3027
}
3128

‎src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ trait RouteTrait
2626
*
2727
* @return $this
2828
*/
29-
final public function defaults(array $defaults)
29+
final public function defaults(array $defaults): self
3030
{
3131
$this->route->addDefaults($defaults);
3232

@@ -38,7 +38,7 @@ final public function defaults(array $defaults)
3838
*
3939
* @return $this
4040
*/
41-
final public function requirements(array $requirements)
41+
final public function requirements(array $requirements): self
4242
{
4343
$this->route->addRequirements($requirements);
4444

@@ -50,7 +50,7 @@ final public function requirements(array $requirements)
5050
*
5151
* @return $this
5252
*/
53-
final public function options(array $options)
53+
final public function options(array $options): self
5454
{
5555
$this->route->addOptions($options);
5656

@@ -62,7 +62,7 @@ final public function options(array $options)
6262
*
6363
* @return $this
6464
*/
65-
final public function utf8(bool $utf8 = true)
65+
final public function utf8(bool $utf8 = true): self
6666
{
6767
$this->route->addOptions(['utf8' => $utf8]);
6868

@@ -74,7 +74,7 @@ final public function utf8(bool $utf8 = true)
7474
*
7575
* @return $this
7676
*/
77-
final public function condition(string $condition)
77+
final public function condition(string $condition): self
7878
{
7979
$this->route->setCondition($condition);
8080

@@ -86,7 +86,7 @@ final public function condition(string $condition)
8686
*
8787
* @return $this
8888
*/
89-
final public function host(string $pattern)
89+
final public function host(string $pattern): self
9090
{
9191
$this->route->setHost($pattern);
9292

@@ -101,7 +101,7 @@ final public function host(string $pattern)
101101
*
102102
* @return $this
103103
*/
104-
final public function schemes(array $schemes)
104+
final public function schemes(array $schemes): self
105105
{
106106
$this->route->setSchemes($schemes);
107107

@@ -116,7 +116,7 @@ final public function schemes(array $schemes)
116116
*
117117
* @return $this
118118
*/
119-
final public function methods(array $methods)
119+
final public function methods(array $methods): self
120120
{
121121
$this->route->setMethods($methods);
122122

@@ -130,7 +130,7 @@ final public function methods(array $methods)
130130
*
131131
* @return $this
132132
*/
133-
fi 741A nal public function controller($controller)
133+
final public function controller($controller): self
134134
{
135135
$this->route->addDefaults(['_controller' => $controller]);
136136

@@ -142,7 +142,7 @@ final public function controller($controller)
142142
*
143143
* @return $this
144144
*/
145-
final public function locale(string $locale)
145+
final public function locale(string $locale): self
146146
{
147147
$this->route->addDefaults(['_locale' => $locale]);
148148

@@ -154,7 +154,7 @@ final public function locale(string $locale)
154154
*
155155
* @return $this
156156
*/
157-
final public function format(string $format)
157+
final public function format(string $format): self
158158
{
159159
$this->route->addDefaults(['_format' => $format]);
160160

0 commit comments

Comments
 (0)
0