Merge branch '2.7' into 2.8

* 2.7:
  [DI] Fix some docblocks
This commit is contained in:
Nicolas Grekas 2017-08-08 23:33:02 +02:00
commit 65fa8c2abf
2 changed files with 24 additions and 4 deletions

View File

@ -729,8 +729,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* This methods allows for simple registration of service definition * This methods allows for simple registration of service definition
* with a fluid interface. * with a fluid interface.
* *
* @param string $id The service identifier * @param string $id The service identifier
* @param string $class The service class * @param string $class|null The service class
* *
* @return Definition A Definition instance * @return Definition A Definition instance
*/ */

View File

@ -265,6 +265,13 @@ class Definition
return $this; return $this;
} }
/**
* Sets the properties to define when creating the service.
*
* @param array $properties
*
* @return $this
*/
public function setProperties(array $properties) public function setProperties(array $properties)
{ {
$this->properties = $properties; $this->properties = $properties;
@ -272,11 +279,24 @@ class Definition
return $this; return $this;
} }
/**
* Gets the properties to define when creating the service.
*
* @return array
*/
public function getProperties() public function getProperties()
{ {
return $this->properties; return $this->properties;
} }
/**
* Sets a specific property.
*
* @param string $name
* @param mixed $value
*
* @return $this
*/
public function setProperty($name, $value) public function setProperty($name, $value)
{ {
$this->properties[$name] = $value; $this->properties[$name] = $value;
@ -299,7 +319,7 @@ class Definition
} }
/** /**
* Sets a specific argument. * Replaces a specific argument.
* *
* @param int $index * @param int $index
* @param mixed $argument * @param mixed $argument
@ -854,7 +874,7 @@ class Definition
} }
/** /**
* Sets autowired. * Enables/disables autowiring.
* *
* @param bool $autowired * @param bool $autowired
* *