Commitce2300a

committed

Merge branch '4.4' into 5.2

* 4.4: CS fix Missing translations from traits

2 parents5da049d +44f08fa commitce2300aCopy full SHA for ce2300a

File tree

+13

-15

lines changed

+13

-15

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ public function getArguments()`
`104`	`104`	`/**`
`105`	`105`	`* {@inheritdoc}`
`106`	`106`	`*/`
`107`		`-publicfunctiongetArgument($name)`
	`107`	`+publicfunctiongetArgument(string$name)`
`108`	`108`	`{`
`109`		`-if (!$this->definition->hasArgument((string)$name)) {`
	`109`	`+if (!$this->definition->hasArgument($name)) {`
`110`	`110`	`thrownewInvalidArgumentException(sprintf('The "%s" argument does not exist.',$name));`
`111`	`111`	`}`
`112`	`112`
`@@ -116,9 +116,9 @@ public function getArgument($name)`
`116`	`116`	`/**`
`117`	`117`	`* {@inheritdoc}`
`118`	`118`	`*/`
`119`		`-publicfunctionsetArgument($name,$value)`
	`119`	`+publicfunctionsetArgument(string$name,$value)`
`120`	`120`	`{`
`121`		`-if (!$this->definition->hasArgument((string)$name)) {`
	`121`	`+if (!$this->definition->hasArgument($name)) {`
`122`	`122`	`thrownewInvalidArgumentException(sprintf('The "%s" argument does not exist.',$name));`
`123`	`123`	`}`
`124`	`124`
`@@ -128,9 +128,9 @@ public function setArgument($name, $value)`
`128`	`128`	`/**`
`129`	`129`	`* {@inheritdoc}`
`130`	`130`	`*/`
`131`		`-publicfunctionhasArgument($name)`
	`131`	`+publicfunctionhasArgument(string$name)`
`132`	`132`	`{`
`133`		`-return$this->definition->hasArgument((string)$name);`
	`133`	`+return$this->definition->hasArgument($name);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`/**`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,32 +83,27 @@ public function getArguments();`
`83`	`83`	`/**`
`84`	`84`	`* Returns the argument value for a given argument name.`
`85`	`85`	`*`
`86`		`- * @param string $name The argument name`
`87`		`- *`
`88`	`86`	`* @return mixed`
`89`	`87`	`*`
`90`	`88`	`* @throws InvalidArgumentException When argument given doesn't exist`
`91`	`89`	`*/`
`92`		`-publicfunctiongetArgument($name);`
	`90`	`+publicfunctiongetArgument(string$name);`
`93`	`91`
`94`	`92`	`/**`
`95`	`93`	`* Sets an argument value by name.`
`96`	`94`	`*`
`97`		`- * @param string $name The argument name`
`98`		`- * @param mixed $value The argument value`
	`95`	`+ * @param mixed $value The argument value`
`99`	`96`	`*`
`100`	`97`	`* @throws InvalidArgumentException When argument given doesn't exist`
`101`	`98`	`*/`
`102`		`-publicfunctionsetArgument($name,$value);`
	`99`	`+publicfunctionsetArgument(string$name,$value);`
`103`	`100`
`104`	`101`	`/**`
`105`	`102`	`* Returns true if an InputArgument object exists by name or position.`
`106`	`103`	`*`
`107`		`- * @param string $name The InputArgument name or position`
`108`		`- *`
`109`	`104`	`* @return bool true if the InputArgument object exists, false otherwise`
`110`	`105`	`*/`
`111`		`-publicfunctionhasArgument($name);`
	`106`	`+publicfunctionhasArgument(string$name);`
`112`	`107`
`113`	`108`	`/**`
`114`	`109`	`* Returns all the given options merged with the default values.`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ public function process(ContainerBuilder $container)`
`60`	`60`	`foreach ($this->pathsas$class =>$_) {`
`61`	`61`	`if (($r =$container->getReflectionClass($class)) && !$r->isInterface()) {`
`62`	`62`	`$paths[] =$r->getFileName();`
	`63`	`+foreach ($r->getTraits()as$trait) {`
	`64`	`+$paths[] =$trait->getFileName();`
	`65`	`+ }`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`	`if ($paths) {`

Comments

(0)