Skip to content

Commit 5dd25a5

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [CS] Apply phpdoc_annotation_without_dot
2 parents fbeea99 + d73694e commit 5dd25a5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Compiler/CheckCircularReferencesPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)
5151
*
5252
* @param ServiceReferenceGraphEdge[] $edges An array of Edges
5353
*
54-
* @throws ServiceCircularReferenceException When a circular reference is found.
54+
* @throws ServiceCircularReferenceException when a circular reference is found
5555
*/
5656
private function checkOutEdges(array $edges)
5757
{

Compiler/CheckReferenceValidityPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function process(ContainerBuilder $container)
8585
*
8686
* @param array $arguments An array of Reference objects
8787
*
88-
* @throws RuntimeException when there is a reference to an abstract definition.
88+
* @throws RuntimeException when there is a reference to an abstract definition
8989
*/
9090
private function validateReferences(array $arguments)
9191
{

Definition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function setFactoryMethod($factoryMethod)
148148
*
149149
* @return $this
150150
*
151-
* @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
151+
* @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
152152
*/
153153
public function setDecoratedService($id, $renamedId = null, $priority = 0)
154154
{

ParameterBag/ParameterBag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function resolve()
151151
*
152152
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
153153
* @throws ParameterCircularReferenceException if a circular reference if detected
154-
* @throws RuntimeException when a given parameter has a type problem.
154+
* @throws RuntimeException when a given parameter has a type problem
155155
*/
156156
public function resolveValue($value, array $resolving = array())
157157
{
@@ -181,7 +181,7 @@ public function resolveValue($value, array $resolving = array())
181181
*
182182
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
183183
* @throws ParameterCircularReferenceException if a circular reference if detected
184-
* @throws RuntimeException when a given parameter has a type problem.
184+
* @throws RuntimeException when a given parameter has a type problem
185185
*/
186186
public function resolveString($value, array $resolving = array())
187187
{

0 commit comments

Comments
 (0)