Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 44efeaa

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '2.3' into 2.7
* 2.3: [DependencyInjection] Remove YAML check in CrossCheckTest [DependencyInjection] fix phpDoc
2 parents 6400b70 + 8c89a3a commit 44efeaa
Copy full SHA for 44efeaa
Expand file treeCollapse file tree

22 files changed

+16
-82
lines changed

‎src/Symfony/Component/DependencyInjection/Alias.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Alias.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ class Alias
1717
private $public;
1818

1919
/**
20-
* Constructor.
21-
*
2220
* @param string $id Alias identifier
2321
* @param bool $public If this alias is public
2422
*/

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface
3434
private $onlyConstructorArguments;
3535

3636
/**
37-
* Constructor.
38-
*
3937
* @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
4038
*/
4139
public function __construct($onlyConstructorArguments = false)

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ class Compiler
2525
private $loggingFormatter;
2626
private $serviceReferenceGraph;
2727

28-
/**
29-
* Constructor.
30-
*/
3128
public function __construct()
3229
{
3330
$this->passConfig = new PassConfig();

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ class PassConfig
3535
private $optimizationPasses;
3636
private $removingPasses;
3737

38-
/**
39-
* Constructor.
40-
*/
4138
public function __construct()
4239
{
4340
$this->mergePass = new MergeExtensionConfigurationPass();

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class RepeatedPass implements CompilerPassInterface
3232
private $passes;
3333

3434
/**
35-
* Constructor.
36-
*
3735
* @param RepeatablePassInterface[] $passes An array of RepeatablePassInterface objects
3836
*
3937
* @throws InvalidArgumentException when the passes don't implement RepeatablePassInterface

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class ServiceReferenceGraphEdge
2525
private $value;
2626

2727
/**
28-
* Constructor.
29-
*
3028
* @param ServiceReferenceGraphNode $sourceNode
3129
* @param ServiceReferenceGraphNode $destNode
3230
* @param string $value

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ class ServiceReferenceGraphNode
2929
private $value;
3030

3131
/**
32-
* Constructor.
33-
*
3432
* @param string $id The node identifier
3533
* @param mixed $value The node value
3634
*/

‎src/Symfony/Component/DependencyInjection/Container.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ class Container implements IntrospectableContainerInterface
7777
private $underscoreMap = array('_' => '', '.' => '_', '\\' => '_');
7878

7979
/**
80-
* Constructor.
81-
*
8280
* @param ParameterBagInterface $parameterBag A ParameterBagInterface instance
8381
*/
8482
public function __construct(ParameterBagInterface $parameterBag = null)

‎src/Symfony/Component/DependencyInjection/ContainerAware.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerAware.php
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ abstract class ContainerAware implements ContainerAwareInterface
2424
protected $container;
2525

2626
/**
27-
* Sets the container.
28-
*
29-
* @param ContainerInterface|null $container A ContainerInterface instance or null
27+
* {@inheritdoc}
3028
*/
3129
public function setContainer(ContainerInterface $container = null)
3230
{

‎src/Symfony/Component/DependencyInjection/Definition.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Definition.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ class Definition
4242
protected $arguments;
4343

4444
/**
45-
* Constructor.
46-
*
4745
* @param string|null $class The service class
4846
* @param array $arguments An array of arguments to pass to the service constructor
4947
*/

‎src/Symfony/Component/DependencyInjection/DefinitionDecorator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class DefinitionDecorator extends Definition
2525
private $changes = array();
2626

2727
/**
28-
* Constructor.
29-
*
3028
* @param string $parent The id of Definition instance to decorate.
3129
*/
3230
public function __construct($parent)

‎src/Symfony/Component/DependencyInjection/Dumper/Dumper.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Dumper/Dumper.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ abstract class Dumper implements DumperInterface
2323
protected $container;
2424

2525
/**
26-
* Constructor.
27-
*
2826
* @param ContainerBuilder $container The service container to dump
2927
*/
3028
public function __construct(ContainerBuilder $container)

‎src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class ParameterNotFoundException extends InvalidArgumentException
2424
private $alternatives;
2525

2626
/**
27-
* Constructor.
28-
*
2927
* @param string $key The requested parameter key
3028
* @param string $sourceId The service id that references the non-existent parameter
3129
* @param string $sourceKey The parameter key that references the non-existent parameter

‎src/Symfony/Component/DependencyInjection/Extension/Extension.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Extension/Extension.php
+2-6Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,15 @@
2727
abstract class Extension implements ExtensionInterface, ConfigurationExtensionInterface
2828
{
2929
/**
30-
* Returns the base path for the XSD files.
31-
*
32-
* @return string The XSD base path
30+
* {@inheritdoc}
3331
*/
3432
public function getXsdValidationBasePath()
3533
{
3634
return false;
3735
}
3836

3937
/**
40-
* Returns the namespace to be used for this extension (XML namespace).
41-
*
42-
* @return string The XML namespace
38+
* {@inheritdoc}
4339
*/
4440
public function getNamespace()
4541
{

‎src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class ClosureLoader extends Loader
2626
private $container;
2727

2828
/**
29-
* Constructor.
30-
*
3129
* @param ContainerBuilder $container A ContainerBuilder instance
3230
*/
3331
public function __construct(ContainerBuilder $container)

‎src/Symfony/Component/DependencyInjection/Loader/FileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ abstract class FileLoader extends BaseFileLoader
2525
protected $container;
2626

2727
/**
28-
* Constructor.
29-
*
3028
* @param ContainerBuilder $container A ContainerBuilder instance
3129
* @param FileLocatorInterface $locator A FileLocator instance
3230
*/

‎src/Symfony/Component/DependencyInjection/Parameter.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Parameter.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ class Parameter
2121
private $id;
2222

2323
/**
24-
* Constructor.
25-
*
2624
* @param string $id The parameter key
2725
*/
2826
public function __construct($id)
@@ -31,8 +29,6 @@ public function __construct($id)
3129
}
3230

3331
/**
34-
* __toString.
35-
*
3632
* @return string The parameter key
3733
*/
3834
public function __toString()

‎src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
class FrozenParameterBag extends ParameterBag
2222
{
2323
/**
24-
* Constructor.
25-
*
2624
* For performance reasons, the constructor assumes that
2725
* all keys are already lowercased.
2826
*

‎src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+7-18Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ class ParameterBag implements ParameterBagInterface
2626
protected $resolved = false;
2727

2828
/**
29-
* Constructor.
30-
*
3129
* @param array $parameters An array of parameters
3230
*/
3331
public function __construct(array $parameters = array())
@@ -56,23 +54,15 @@ public function add(array $parameters)
5654
}
5755

5856
/**
59-
* Gets the service container parameters.
60-
*
61-
* @return array An array of parameters
57+
* {@inheritdoc}
6258
*/
6359
public function all()
6460
{
6561
return $this->parameters;
6662
}
6763

6864
/**
69-
* Gets a service container parameter.
70-
*
71-
* @param string $name The parameter name
72-
*
73-
* @return mixed The parameter value
74-
*
75-
* @throws ParameterNotFoundException if the parameter is not defined
65+
* {@inheritdoc}
7666
*/
7767
public function get($name)
7868
{
@@ -109,11 +99,7 @@ public function set($name, $value)
10999
}
110100

111101
/**
112-
* Returns true if a parameter name is defined.
113-
*
114-
* @param string $name The parameter name
115-
*
116-
* @return bool true if the parameter name is defined, false otherwise
102+
* {@inheritdoc}
117103
*/
118104
public function has($name)
119105
{
@@ -131,7 +117,7 @@ public function remove($name)
131117
}
132118

133119
/**
134-
* Replaces parameter placeholders (%name%) by their values for all parameters.
120+
* {@inheritdoc}
135121
*/
136122
public function resolve()
137123
{
@@ -266,6 +252,9 @@ public function escapeValue($value)
266252
return $value;
267253
}
268254

255+
/**
256+
* {@inheritdoc}
257+
*/
269258
public function unescapeValue($value)
270259
{
271260
if (is_string($value)) {

‎src/Symfony/Component/DependencyInjection/Reference.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Reference.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class Reference
2323
private $strict;
2424

2525
/**
26-
* Constructor.
27-
*
2826
* @param string $id The service identifier
2927
* @param int $invalidBehavior The behavior when the service does not exist
3028
* @param bool $strict Sets how this reference is validated
@@ -39,8 +37,6 @@ public function __construct($id, $invalidBehavior = ContainerInterface::EXCEPTIO
3937
}
4038

4139
/**
42-
* __toString.
43-
*
4440
* @return string The service identifier
4541
*/
4642
public function __toString()

‎src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php
+6-13Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,17 @@ public function testCrossCheck($fixture, $type)
7373

7474
public function crossCheckLoadersDumpers()
7575
{
76-
$tests = array(
76+
return array(
7777
array('services1.xml', 'xml'),
7878
array('services2.xml', 'xml'),
7979
array('services6.xml', 'xml'),
8080
array('services8.xml', 'xml'),
8181
array('services9.xml', 'xml'),
82+
array('services1.yml', 'yaml'),
83+
array('services2.yml', 'yaml'),
84+
array('services6.yml', 'yaml'),
85+
array('services8.yml', 'yaml'),
86+
array('services9.yml', 'yaml'),
8287
);
83-
84-
if (class_exists('Symfony\Component\Yaml\Yaml')) {
85-
$tests = array_merge($tests, array(
86-
array('services1.yml', 'yaml'),
87-
array('services2.yml', 'yaml'),
88-
array('services6.yml', 'yaml'),
89-
array('services8.yml', 'yaml'),
90-
array('services9.yml', 'yaml'),
91-
));
92-
}
93-
94-
return $tests;
9588
}
9689
}

‎src/Symfony/Component/DependencyInjection/Variable.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Variable.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ class Variable
2929
private $name;
3030

3131
/**
32-
* Constructor.
33-
*
3432
* @param string $name
3533
*/
3634
public function __construct($name)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.