Skip to content

Commit 3e3b866

Browse files
committed
Revert CS fixer's return type changes
1 parent ddcfbb5 commit 3e3b866

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

src/Attribute/Inject.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function __construct(string|array|null $name = null)
5959
/**
6060
* @return string|null Name of the entry to inject
6161
*/
62-
public function getName() : ?string
62+
public function getName() : string|null
6363
{
6464
return $this->name;
6565
}

src/Attribute/Injectable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(
2727
) {
2828
}
2929

30-
public function isLazy() : ?bool
30+
public function isLazy() : bool|null
3131
{
3232
return $this->lazy;
3333
}

src/Definition/Source/AttributeBasedAutowiring.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AttributeBasedAutowiring implements DefinitionSource, Autowiring
3131
/**
3232
* @throws InvalidAttribute
3333
*/
34-
public function autowire(string $name, ?ObjectDefinition $definition = null) : ?ObjectDefinition
34+
public function autowire(string $name, ?ObjectDefinition $definition = null) : ObjectDefinition|null
3535
{
3636
$className = $definition ? $definition->getClassName() : $name;
3737

@@ -58,7 +58,7 @@ public function autowire(string $name, ?ObjectDefinition $definition = null) : ?
5858
* @throws InvalidAttribute
5959
* @throws InvalidArgumentException The class doesn't exist
6060
*/
61-
public function getDefinition(string $name) : ?ObjectDefinition
61+
public function getDefinition(string $name) : ObjectDefinition|null
6262
{
6363
return $this->autowire($name);
6464
}

src/Definition/Source/Autowiring.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ interface Autowiring
1919
*
2020
* @throws InvalidDefinition An invalid definition was found.
2121
*/
22-
public function autowire(string $name, ?ObjectDefinition $definition = null) : ?ObjectDefinition;
22+
public function autowire(string $name, ?ObjectDefinition $definition = null) : ObjectDefinition|null;
2323
}

src/Definition/Source/DefinitionArray.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function addDefinition(Definition $definition) : void
6363
$this->wildcardDefinitions = null;
6464
}
6565

66-
public function getDefinition(string $name) : ?Definition
66+
public function getDefinition(string $name) : Definition|null
6767
{
6868
// Look for the definition by name
6969
if (array_key_exists($name, $this->definitions)) {

src/Definition/Source/DefinitionFile.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct(
2626
parent::__construct([], $autowiring);
2727
}
2828

29-
public function getDefinition(string $name) : ?Definition
29+
public function getDefinition(string $name) : Definition|null
3030
{
3131
$this->initialize();
3232

src/Definition/Source/DefinitionSource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ interface DefinitionSource
1919
*
2020
* @throws InvalidDefinition An invalid definition was found.
2121
*/
22-
public function getDefinition(string $name) : ?Definition;
22+
public function getDefinition(string $name) : Definition|null;
2323

2424
/**
2525
* @return array<string,Definition> Definitions indexed by their name.

src/Definition/Source/NoAutowiring.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
class NoAutowiring implements Autowiring
1616
{
17-
public function autowire(string $name, ?ObjectDefinition $definition = null) : ?ObjectDefinition
17+
public function autowire(string $name, ?ObjectDefinition $definition = null) : ObjectDefinition|null
1818
{
1919
throw new InvalidDefinition(sprintf(
2020
'Cannot autowire entry "%s" because autowiring is disabled',

src/Definition/Source/ReflectionBasedAutowiring.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class ReflectionBasedAutowiring implements DefinitionSource, Autowiring
1818
{
19-
public function autowire(string $name, ?ObjectDefinition $definition = null) : ?ObjectDefinition
19+
public function autowire(string $name, ?ObjectDefinition $definition = null) : ObjectDefinition|null
2020
{
2121
$className = $definition ? $definition->getClassName() : $name;
2222

@@ -37,7 +37,7 @@ public function autowire(string $name, ?ObjectDefinition $definition = null) : ?
3737
return $definition;
3838
}
3939

40-
public function getDefinition(string $name) : ?ObjectDefinition
40+
public function getDefinition(string $name) : ObjectDefinition|null
4141
{
4242
return $this->autowire($name);
4343
}

src/Definition/Source/SourceCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function __construct(
2323
) {
2424
}
2525

26-
public function getDefinition(string $name) : ?Definition
26+
public function getDefinition(string $name) : Definition|null
2727
{
2828
$definition = apcu_fetch($this->getCacheKey($name));
2929

0 commit comments

Comments
 (0)