Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 9b385f6bb743 · 2015-11-04T19:50:51.000+01:00
* 2.3:
  [DI] Clean a phpdoc
diff --git a/ContainerAware.php b/ContainerAware.php
@@ -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)
     {
diff --git a/ContainerAwareInterface.php b/ContainerAwareInterface.php
@@ -19,7 +19,7 @@
 interface ContainerAwareInterface
 {
     /**
-     * Sets the Container.
+     * Sets the container.
      *
      * @param ContainerInterface|null $container A ContainerInterface instance or null
      */
diff --git a/ContainerAwareTrait.php b/ContainerAwareTrait.php
@@ -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)
     {

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ abstract class ContainerAware implements ContainerAwareInterface`
`24`	`24`	`protected $container;`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * Sets the Container associated with this Controller.`
	`27`	`+ * Sets the container.`
`28`	`28`	`*`
`29`		`- * @param ContainerInterface $container A ContainerInterface instance`
	`29`	`+ * @param ContainerInterface\|null $container A ContainerInterface instance or null`
`30`	`30`	`*/`
`31`	`31`	`public function setContainer(ContainerInterface $container = null)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`interface ContainerAwareInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * Sets the Container.`
	`22`	`+ * Sets the container.`
`23`	`23`	`*`
`24`	`24`	`* @param ContainerInterface\|null $container A ContainerInterface instance or null`
`25`	`25`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ trait ContainerAwareTrait`
`24`	`24`	`protected $container;`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * Sets the Container associated with this Controller.`
	`27`	`+ * Sets the container.`
`28`	`28`	`*`
`29`		`- * @param ContainerInterface $container A ContainerInterface instance`
	`29`	`+ * @param ContainerInterface\|null $container A ContainerInterface instance or null`
`30`	`30`	`*/`
`31`	`31`	`public function setContainer(ContainerInterface $container = null)`
`32`	`32`	`{`