diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  [DI] Clean a phpdoc
This commit is contained in:
Nicolas Grekas 2015-11-04 19:50:09 +01:00
commit 6fe192601c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/DependencyInjection/ContainerAware.php
View File

@ -24,9 +24,9 @@ abstract class ContainerAware implements ContainerAwareInterface
protected $container;
/**
* Sets the Container associated with this Controller.
* Sets the container.
*
* @param ContainerInterface $container A ContainerInterface instance
* @param ContainerInterface|null $container A ContainerInterface instance or null
*/
public function setContainer(ContainerInterface $container = null)
{

2
src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
View File

@ -19,7 +19,7 @@ namespace Symfony\Component\DependencyInjection;
interface ContainerAwareInterface
{
/**
* Sets the Container.
* Sets the container.
*
* @param ContainerInterface|null $container A ContainerInterface instance or null
*/

4
src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
View File

@ -24,9 +24,9 @@ trait ContainerAwareTrait
protected $container;
/**
* Sets the Container associated with this Controller.
* Sets the container.
*
* @param ContainerInterface $container A ContainerInterface instance
* @param ContainerInterface|null $container A ContainerInterface instance or null
*/
public function setContainer(ContainerInterface $container = null)
{