Skip to content

Commit bcf5aeb

Browse files
committed
Merge branch '3.0' into 3.1
* 3.0: fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo
2 parents 048dc47 + 86c702d commit bcf5aeb

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

ConfigCacheInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function getPath();
3232
*
3333
* This check should take the metadata passed to the write() method into consideration.
3434
*
35-
* @return bool Whether the cache is still fresh.
35+
* @return bool Whether the cache is still fresh
3636
*/
3737
public function isFresh();
3838

Definition/ArrayNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ protected function remapXml($value)
347347
/**
348348
* Merges values together.
349349
*
350-
* @param mixed $leftSide The left side to merge.
351-
* @param mixed $rightSide The right side to merge.
350+
* @param mixed $leftSide The left side to merge
351+
* @param mixed $rightSide The right side to merge
352352
*
353353
* @return mixed The merged values
354354
*

Definition/BaseNode.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function isRequired()
184184
/**
185185
* Returns the name of this node.
186186
*
187-
* @return string The Node's name.
187+
* @return string The Node's name
188188
*/
189189
public function getName()
190190
{
@@ -237,9 +237,9 @@ final public function merge($leftSide, $rightSide)
237237
/**
238238
* Normalizes a value, applying all normalization closures.
239239
*
240-
* @param mixed $value Value to normalize.
240+
* @param mixed $value Value to normalize
241241
*
242-
* @return mixed The normalized value.
242+
* @return mixed The normalized value
243243
*/
244244
final public function normalize($value)
245245
{
@@ -329,7 +329,7 @@ abstract protected function validateType($value);
329329
/**
330330
* Normalizes the value.
331331
*
332-
* @param mixed $value The value to normalize.
332+
* @param mixed $value The value to normalize
333333
*
334334
* @return mixed The normalized value
335335
*/

Definition/Builder/ArrayNodeDefinition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public function fixXmlConfig($singular, $plural = null)
178178
* This method is applicable to prototype nodes only.
179179
*
180180
* @param string $name The name of the key
181-
* @param bool $removeKeyItem Whether or not the key item should be removed.
181+
* @param bool $removeKeyItem Whether or not the key item should be removed
182182
*
183183
* @return ArrayNodeDefinition
184184
*/

Definition/PrototypedArrayNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ protected function normalizeValue($value)
278278
/**
279279
* Merges values together.
280280
*
281-
* @param mixed $leftSide The left side to merge.
282-
* @param mixed $rightSide The right side to merge.
281+
* @param mixed $leftSide The left side to merge
282+
* @param mixed $rightSide The right side to merge
283283
*
284284
* @return mixed The merged values
285285
*

Definition/VariableNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function getDefaultValue()
5757
/**
5858
* Sets if this node is allowed to have an empty value.
5959
*
60-
* @param bool $boolean True if this entity will accept empty values.
60+
* @param bool $boolean True if this entity will accept empty values
6161
*/
6262
public function setAllowEmptyValue($boolean)
6363
{

Resource/FileResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function __toString()
5454
}
5555

5656
/**
57-
* @return string The canonicalized, absolute path to the resource.
57+
* @return string The canonicalized, absolute path to the resource
5858
*/
5959
public function getResource()
6060
{

ResourceCheckerInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public function supports(ResourceInterface $metadata);
3939
/**
4040
* Validates the resource.
4141
*
42-
* @param ResourceInterface $resource The resource to be validated.
43-
* @param int $timestamp The timestamp at which the cache associated with this resource was created.
42+
* @param ResourceInterface $resource The resource to be validated
43+
* @param int $timestamp The timestamp at which the cache associated with this resource was created
4444
*
45-
* @return bool True if the resource has not changed since the given timestamp, false otherwise.
45+
* @return bool True if the resource has not changed since the given timestamp, false otherwise
4646
*/
4747
public function isFresh(ResourceInterface $resource, $timestamp);
4848
}

0 commit comments

Comments
 (0)