8000 merged branch stof/fix_phpdoc (PR #5467) · krmcbride/symfony@2e7e296 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2e7e296

Browse files
fabpotfabpot
committed
merged branch stof/fix_phpdoc (PR symfony#5467)
Commits ------- 05f7f78 Fixed the phpdoc in the DependencyInjection component Discussion ---------- Fixed the phpdoc in the DependencyInjection component I was sick of having a warning in my IDE each time I used DefinitionDecorator because of an invalid phpdoc in the constructor, so I took some time and fixed it in the whole DI component. --------------------------------------------------------------------------- by stof at 2012-09-07T23:09:04Z The travis failure is unrelated. It is all about some intl failures. --------------------------------------------------------------------------- by eventhorizonpl at 2012-09-07T23:37:04Z Reviewed-by: Michal Piotrowski <michal@eventhorizon.pl> --------------------------------------------------------------------------- by pborreli at 2012-09-08T01:42:26Z :+1:
2 parents 462f93a + 05f7f78 commit 2e7e296

22 files changed

+95
-78
lines changed

‎src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private function processArguments(array $arguments)
116116
*
117117
* @param string $id A full id or alias for a service definition.
118118
*
119-
* @return Definition The definition related to the supplied id
119+
* @return Definition|null The definition related to the supplied id
120120
*/
121121
private function getDefinition($id)
122122
{

‎src/Symfony/Component/DependencyInjection/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 array $edges An array of Nodes
5353
*
54-
* @throws \RuntimeException When a circular reference is found.
54+
* @throws ServiceCircularReferenceException When a circular reference is found.
5555
*/
5656
private function checkOutEdges(array $edges)
5757
{

‎src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private function validateReferences(array $arguments)
116116
* @param Reference $reference
117117
* @param Definition $definition
118118
*
119-
* @throws \RuntimeException when there is an issue with the Reference scope
119+
* @throws ScopeWideningInjectionException|ScopeCrossingInjectionException when there is an issue with the Reference scope
120120
*/
121121
private function validateScope(Reference $reference, Definition $definition = null)
122122
{

‎src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ public function process(ContainerBuilder $container)
7070
*
7171
* @param ContainerBuilder $container The ContainerBuilder
7272
* @param array $arguments An array of arguments
73+
*
74+
* @return array
7375
*/
7476
private function inlineArguments(ContainerBuilder $container, array $arguments)
7577
{

‎src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public function setRepeatedPass(RepeatedPass $repeatedPass)
3434
* Processes the ContainerBuilder to remove unused definitions.
3535
*
3636
* @param ContainerBuilder $container
37-
*
38-
* @return void
3937
*/
4038
public function process(ContainerBuilder $container)
4139
{

‎src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class RepeatedPass implements CompilerPassInterface
2727
* Constructor.
2828
*
2929
* @param array $passes An array of RepeatablePassInterface objects
30+
*
31+
* @throws \InvalidArgumentException when the passes don't implement RepeatablePassInterface
3032
*/
3133
public function __construct(array $passes)
3234
{
@@ -48,7 +50,7 @@ public function __construct(array $passes)
4850
*/
4951
public function process(ContainerBuilder $container)
5052
{
51-
$compiler = $container->getCompiler();
53+
$container->getCompiler();
5254
$this->repeat = false;
5355
foreach ($this->passes as $pass) {
5456
$pass->process($container);

‎src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ private function updateReferences($container, $currentId, $newId)
9797
* @param array $arguments An array of Arguments
9898
* @param string $currentId The alias identifier
9999
* @param string $newId The identifier the alias points to
100+
*
101+
* @return array
100102
*/
101103
private function updateArgumentReferences(array $arguments, $currentId, $newId)
102104
{

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public function process(ContainerBuilder $container)
5757
* @param DefinitionDecorator $definition
5858
*
5959
* @return Definition
60+
*
61+
* @throws \RuntimeException When the definition is invalid
6062
*/
6163
private function resolveDefinition($id, DefinitionDecorator $definition)
6264
{

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ public function process(ContainerBuilder $container)
7070
*
7171
* @param array $arguments An array of Reference objects
7272
* @param Boolean $inMethodCall
73+
*
74+
* @return array
75+
*
76+
* @throws \RuntimeException When the config is invalid
7377
*/
7478
private function processArguments(array $arguments, $inMethodCall = false)
7579
{

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class ResolveParameterPlaceHoldersPass implements CompilerPassInterface
2727
* Processes the ContainerBuilder to resolve parameter placeholders.
2828
*
2929
* @param ContainerBuilder $container
30+
*
31+
* @throws ParameterNotFoundException When an invalid parameter is referenced
3032
*/
3133
public function process(ContainerBuilder $container)
3234
{

0 commit comments

Comments
 (0)
0