Skip to content

Commit aa283f9

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: fixed CS [2.8] Modify 2.8 upgrade doc - key option is deprecated. [DebugBundle] Reword an outdated comment about var dumper wiring [DI] Fix some docblocks [DI] Fix some docblocks Fixed the exception page design in responsive mode [Console] Log exit codes as debug messages instead of errors Fixed UPGRADE-4.0 about Container::set Ignore memcached missing key error on dession destroy bumped Symfony version to 3.2.14 updated VERSION for 3.2.13 updated CHANGELOG for 3.2.13
2 parents 108c15b + a72d48c commit aa283f9

File tree

3 files changed

+34
-6
lines changed

3 files changed

+34
-6
lines changed

ChildDefinition.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct($parent)
3333
}
3434

3535
/**
36-
* Returns the Definition being decorated.
36+
* Returns the Definition to inherit from.
3737
*
3838
* @return string
3939
*/
@@ -43,7 +43,7 @@ public function getParent()
4343
}
4444

4545
/**
46-
* Sets the Definition being decorated.
46+
* Sets the Definition to inherit from.
4747
*
4848
* @param string $parent
4949
*

ContainerBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -868,8 +868,8 @@ public function getAlias($id)
868868
* This methods allows for simple registration of service definition
869869
* with a fluid interface.
870870
*
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
873873
*
874874
* @return Definition A Definition instance
875875
*/

Definition.php

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,38 @@ public function setArguments(array $arguments)
190190
return $this;
191191
}
192192

193+
/**
194+
* Sets the properties to define when creating the service.
195+
*
196+
* @param array $properties
197+
*
198+
* @return $this
199+
*/
193200
public function setProperties(array $properties)
194201
{
195202
$this->properties = $properties;
196203

197204
return $this;
198205
}
199206

207+
/**
208+
* Gets the properties to define when creating the service.
209+
*
210+
* @return array
211+
*/
200212
public function getProperties()
201213
{
202214
return $this->properties;
203215
}
204216

217+
/**
218+
* Sets a specific property.
219+
*
220+
* @param string $name
221+
* @param mixed $value
222+
*
223+
* @return $this
224+
*/
205225
public function setProperty($name, $value)
206226
{
207227
$this->properties[$name] = $value;
@@ -224,7 +244,7 @@ public function addArgument($argument)
224244
}
225245

226246
/**
227-
* Sets a specific argument.
247+
* Replaces a specific argument.
228248
*
229249
* @param int|string $index
230250
* @param mixed $argument
@@ -252,6 +272,14 @@ public function replaceArgument($index, $argument)
252272
return $this;
253273
}
254274

275+
/**
276+
* Sets a specific argument.
277+
*
278+
* @param int|string $key
279+
* @param mixed $value
280+
*
281+
* @return $this
282+
*/
255283
public function setArgument($key, $value)
256284
{
257285
$this->arguments[$key] = $value;
@@ -780,7 +808,7 @@ public function isAutowired()
780808
}
781809

782810
/**
783-
* Sets autowired.
811+
* Enables/disables autowiring.
784812
*
785813
* @param bool $autowired
786814
*

0 commit comments

Comments
 (0)