Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 2c1f34960220 · 2019-08-20T14:49:02.000+02:00
* 3.4:
  cs fix
  [HttpKernel] Remove outdated docblock comment
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper;
 
 use PHPUnit\Framework\TestCase;
-use ProxyManager\Version;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -174,7 +174,7 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
     /**
      * Describes a callable.
      *
-     * @param callable $callable
+     * @param mixed $callable
      */
     abstract protected function describeCallable($callable, array $options = []);
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -200,9 +200,7 @@ private function addParameters(): string
     /**
      * Dumps callable to YAML format.
      *
-     * @param callable $callable
-     *
-     * @return callable
+     * @param mixed $callable
      */
     private function dumpCallable($callable)
     {
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -18,8 +18,7 @@
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 /**
- * An implementation of BundleInterface that adds a few conventions
- * for DependencyInjection extensions and Console commands.
+ * An implementation of BundleInterface that adds a few conventions for DependencyInjection extensions.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte`
`174`	`174`	`/**`
`175`	`175`	`* Describes a callable.`
`176`	`176`	`*`
`177`		`- * @param callable $callable`
	`177`	`+ * @param mixed $callable`
`178`	`178`	`*/`
`179`	`179`	`abstract protected function describeCallable($callable, array $options = []);`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,7 @@ private function addParameters(): string`
`200`	`200`	`/**`
`201`	`201`	`* Dumps callable to YAML format.`
`202`	`202`	`*`
`203`		`- * @param callable $callable`
`204`		`- *`
`205`		`- * @return callable`
	`203`	`+ * @param mixed $callable`
`206`	`204`	`*/`
`207`	`205`	`private function dumpCallable($callable)`
`208`	`206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@`
`18`	`18`	`use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * An implementation of BundleInterface that adds a few conventions`
`22`		`- * for DependencyInjection extensions and Console commands.`
	`21`	`+ * An implementation of BundleInterface that adds a few conventions for DependencyInjection extensions.`
`23`	`22`	`*`
`24`	`23`	`* @author Fabien Potencier <fabien@symfony.com>`
`25`	`24`	`*/`