Merge branch '3.4' into 4.3

* 3.4:
  cs fix
  [HttpKernel] Remove outdated docblock comment
This commit is contained in:
Nicolas Grekas 2019-08-20 14:49:02 +02:00
commit 2c1f349602
4 changed files with 3 additions and 7 deletions

View File

@ -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;

View File

@ -174,7 +174,7 @@ abstract class Descriptor implements DescriptorInterface
/**
* Describes a callable.
*
* @param callable $callable
* @param mixed $callable
*/
abstract protected function describeCallable($callable, array $options = []);

View File

@ -200,9 +200,7 @@ class YamlDumper extends Dumper
/**
* Dumps callable to YAML format.
*
* @param callable $callable
*
* @return callable
* @param mixed $callable
*/
private function dumpCallable($callable)
{

View File

@ -18,8 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
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>
*/