Merge branch '2.7' into 2.8

fabpot · fabpot · commit 830a8f1df121 · 2016-01-21T10:05:51.000+01:00
* 2.7:
  fixed CS
  fixed test
  fixed CS
  Remove default match from AbstractConfigCommand::findExtension
diff --git a/DefinitionDecorator.php b/DefinitionDecorator.php
@@ -78,7 +78,6 @@ public function setFactory($callable)
 
     /**
      * {@inheritdoc}
-     *
      */
     public function setFactoryClass($class)
     {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ public function setFactory($callable)`
`78`	`78`
`79`	`79`	`/**`
`80`	`80`	`* {@inheritdoc}`
`81`		`- *`
`82`	`81`	`*/`
`83`	`82`	`public function setFactoryClass($class)`
`84`	`83`	`{`