Skip to content

Commit 6d98186

Browse files
Merge branch '5.2' into 5.3
* 5.2: Backport type fixes Fix CS Avoid triggering the autoloader in Deprecation::isLegacy() fix markdown markup Backport type fixes uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [Form] better form doc types to support static analysis
2 parents 3af15ef + 29c50e3 commit 6d98186

17 files changed

+9
-35
lines changed

Definition/ArrayNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
3232
protected $removeExtraKeys = true;
3333
protected $normalizeKeys = true;
3434

35-
public function setNormalizeKeys($normalizeKeys)
35+
public function setNormalizeKeys(bool $normalizeKeys)
3636
{
37-
$this->normalizeKeys = (bool) $normalizeKeys;
37+
$this->normalizeKeys = $normalizeKeys;
3838
}
3939

4040
/**

Definition/BaseNode.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,6 @@ public function addEquivalentValue($originalValue, $equivalentValue)
187187

188188
/**
189189
* Set this node as required.
190-
*
191-
* @param bool $boolean Required node
192190
*/
193191
public function setRequired(bool $boolean)
194192
{

Definition/Builder/NodeDefinition.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ public function end()
105105
/**
106106
* Creates the node.
107107
*
108-
* @param bool $forceRootNode Whether to force this node as the root node
109-
*
110108
* @return NodeInterface
111109
*/
112110
public function getNode(bool $forceRootNode = false)

Definition/Exception/InvalidConfigurationException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class InvalidConfigurationException extends Exception
2222
private $path;
2323
private $containsHints = false;
2424

25-
public function setPath($path)
25+
public function setPath(string $path)
2626
{
2727
$this->path = $path;
2828
}

Resource/ClassExistenceResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public function __construct(string $resource, bool $exists = null)
4242
}
4343
}
4444

45-
/**
46-
* {@inheritdoc}
47-
*/
4845
public function __toString(): string
4946
{
5047
return $this->resource;

Resource/ComposerResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ public function getVendors(): array
3535
return array_keys($this->vendors);
3636
}
3737

38-
/**
39-
* {@inheritdoc}
40-
*/
4138
public function __toString(): string
4239
{
4340
return __CLASS__;

Resource/DirectoryResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ public function __construct(string $resource, string $pattern = null)
3939
}
4040
}
4141

42-
/**
43-
* {@inheritdoc}
44-
*/
4542
public function __toString(): string
4643
{
4744
return md5(serialize([$this->resource, $this->pattern]));

Resource/FileExistenceResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public function __construct(string $resource)
3636
$this->exists = file_exists($resource);
3737
}
3838

39-
/**
40-
* {@inheritdoc}
41-
*/
4239
public function __toString(): string
4340
{
4441
return $this->resource;

Resource/FileResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ public function __construct(string $resource)
4141
}
4242
}
4343

44-
/**
45-
* {@inheritdoc}
46-
*/
4744
public function __toString(): string
4845
{
4946
return $this->resource;

Resource/GlobResource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ public function getPrefix(): string
6060
return $this->prefix;
6161
}
6262

63-
/**
64-
* {@inheritdoc}
65-
*/
6663
public function __toString(): string
6764
{
6865
return 'glob.'.$this->prefix.(int) $this->recursive.$this->pattern.(int) $this->forExclusion.implode("\0", $this->excludedPrefixes);

0 commit comments

Comments
 (0)