Skip to content

Commit 1578bc3

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: [2.3] CS And DocBlock Fixes [2.3] CS Fixes Conflicts: src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Application.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php src/Symfony/Component/Form/FormError.php src/Symfony/Component/HttpFoundation/Request.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/Process/ProcessUtils.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php src/Symfony/Component/Validator/Constraints/GroupSequence.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php src/Symfony/Component/Validator/Mapping/MemberMetadata.php src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
2 parents 00ece11 + 42eeab1 commit 1578bc3

31 files changed

+81
-80
lines changed

Compiler/CheckCircularReferencesPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616

1717
/**
18-
* Checks your services for circular references
18+
* Checks your services for circular references.
1919
*
2020
* References from method calls are ignored since we might be able to resolve
2121
* these references depending on the order in which services are called.

Compiler/CheckReferenceValidityPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Symfony\Component\DependencyInjection\Exception\ScopeWideningInjectionException;
2121

2222
/**
23-
* Checks the validity of references
23+
* Checks the validity of references.
2424
*
2525
* The following checks are performed by this pass:
2626
* - target definitions are not abstract

Compiler/CompilerPassInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\DependencyInjection\ContainerBuilder;
1515

1616
/**
17-
* Interface that must be implemented by compilation passes
17+
* Interface that must be implemented by compilation passes.
1818
*
1919
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
2020
*

Compiler/MergeExtensionConfigurationPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
1616

1717
/**
18-
* Merges extension configs into the container builder
18+
* Merges extension configs into the container builder.
1919
*
2020
* @author Fabien Potencier <fabien@symfony.com>
2121
*/

Compiler/PassConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
1515

1616
/**
17-
* Compiler Pass Configuration
17+
* Compiler Pass Configuration.
1818
*
1919
* This class has a default configuration embedded.
2020
*

Compiler/RemoveAbstractDefinitionsPass.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
use Symfony\Component\DependencyInjection\ContainerBuilder;
1515

1616
/**
17-
* Removes abstract Definitions
18-
*
17+
* Removes abstract Definitions.
1918
*/
2019
class RemoveAbstractDefinitionsPass implements CompilerPassInterface
2120
{
2221
/**
23-
* Removes abstract definitions from the ContainerBuilder
22+
* Removes abstract definitions from the ContainerBuilder.
2423
*
2524
* @param ContainerBuilder $container
2625
*/

Compiler/RemovePrivateAliasesPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class RemovePrivateAliasesPass implements CompilerPassInterface
2424
{
2525
/**
26-
* Removes private aliases from the ContainerBuilder
26+
* Removes private aliases from the ContainerBuilder.
2727
*
2828
* @param ContainerBuilder $container
2929
*/

Compiler/RepeatedPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ public function process(ContainerBuilder $container)
6969
}
7070

7171
/**
72-
* Sets if the pass should repeat
72+
* Sets if the pass should repeat.
7373
*/
7474
public function setRepeat()
7575
{
7676
$this->repeat = true;
7777
}
7878

7979
/**
80-
* Returns the passes
80+
* Returns the passes.
8181
*
8282
* @return RepeatablePassInterface[] An array of RepeatablePassInterface objects
8383
*/

Compiler/ResolveDefinitionTemplatesPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function process(ContainerBuilder $container)
5252
}
5353

5454
/**
55-
* Resolves the definition
55+
* Resolves the definition.
5656
*
5757
* @param string $id The definition identifier
5858
* @param DefinitionDecorator $definition

Compiler/ServiceReferenceGraphEdge.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceRefere
3939
}
4040

4141
/**
42-
* Returns the value of the edge
42+
* Returns the value of the edge.
4343
*
4444
* @return ServiceReferenceGraphNode
4545
*/
@@ -49,7 +49,7 @@ public function getValue()
4949
}
5050

5151
/**
52-
* Returns the source node
52+
* Returns the source node.
5353
*
5454
* @return ServiceReferenceGraphNode
5555
*/
@@ -59,7 +59,7 @@ public function getSourceNode()
5959
}
6060

6161
/**
62-
* Returns the destination node
62+
* Returns the destination node.
6363
*
6464
* @return ServiceReferenceGraphNode
6565
*/

0 commit comments

Comments
 (0)