Merge branch '2.8' into 3.3

fabpot · fabpot · commit ac3ee2c3c2f5 · 2017-08-10T09:03:10.000+02:00
* 2.8:
  fixed CS
  [2.8] Modify 2.8 upgrade doc - key option is deprecated.
  [DI] Fix some docblocks
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -868,8 +868,8 @@ public function getAlias($id)
      * This methods allows for simple registration of service definition
      * with a fluid interface.
      *
-     * @param string $id    The service identifier
-     * @param string $class The service class
+     * @param string $id         The service identifier
+     * @param string $class|null The service class
      *
      * @return Definition A Definition instance
      */
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -188,18 +188,38 @@ public function setArguments(array $arguments)
         return $this;
     }
 
+    /**
+     * Sets the properties to define when creating the service.
+     *
+     * @param array $properties
+     *
+     * @return $this
+     */
     public function setProperties(array $properties)
     {
         $this->properties = $properties;
 
         return $this;
     }
 
+    /**
+     * Gets the properties to define when creating the service.
+     *
+     * @return array
+     */
     public function getProperties()
     {
         return $this->properties;
     }
 
+    /**
+     * Sets a specific property.
+     *
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return $this
+     */
     public function setProperty($name, $value)
     {
         $this->properties[$name] = $value;
@@ -222,7 +242,7 @@ public function addArgument($argument)
     }
 
     /**
-     * Sets a specific argument.
+     * Replaces a specific argument.
      *
      * @param int|string $index
      * @param mixed      $argument

Original file line number	Diff line number	Diff line change
`@@ -868,8 +868,8 @@ public function getAlias($id)`
`868`	`868`	`* This methods allows for simple registration of service definition`
`869`	`869`	`* with a fluid interface.`
`870`	`870`	`*`
`871`		`- * @param string $id The service identifier`
`872`		`- * @param string $class The service class`
	`871`	`+ * @param string $id The service identifier`
	`872`	`+ * @param string $class\|null The service class`
`873`	`873`	`*`
`874`	`874`	`* @return Definition A Definition instance`
`875`	`875`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -188,18 +188,38 @@ public function setArguments(array $arguments)`
`188`	`188`	`return $this;`
`189`	`189`	`}`
`190`	`190`
	`191`	`+ /**`
	`192`	`+ * Sets the properties to define when creating the service.`
	`193`	`+ *`
	`194`	`+ * @param array $properties`
	`195`	`+ *`
	`196`	`+ * @return $this`
	`197`	`+ */`
`191`	`198`	`public function setProperties(array $properties)`
`192`	`199`	`{`
`193`	`200`	`$this->properties = $properties;`
`194`	`201`
`195`	`202`	`return $this;`
`196`	`203`	`}`
`197`	`204`
	`205`	`+ /**`
	`206`	`+ * Gets the properties to define when creating the service.`
	`207`	`+ *`
	`208`	`+ * @return array`
	`209`	`+ */`
`198`	`210`	`public function getProperties()`
`199`	`211`	`{`
`200`	`212`	`return $this->properties;`
`201`	`213`	`}`
`202`	`214`
	`215`	`+ /**`
	`216`	`+ * Sets a specific property.`
	`217`	`+ *`
	`218`	`+ * @param string $name`
	`219`	`+ * @param mixed $value`
	`220`	`+ *`
	`221`	`+ * @return $this`
	`222`	`+ */`
`203`	`223`	`public function setProperty($name, $value)`
`204`	`224`	`{`
`205`	`225`	`$this->properties[$name] = $value;`
`@@ -222,7 +242,7 @@ public function addArgument($argument)`
`222`	`242`	`}`
`223`	`243`
`224`	`244`	`/**`
`225`		`- * Sets a specific argument.`
	`245`	`+ * Replaces a specific argument.`
`226`	`246`	`*`
`227`	`247`	`* @param int\|string $index`
`228`	`248`	`* @param mixed $argument`