Merge branch '3.4' into 4.3
* 3.4: cs fix [HttpKernel] Remove outdated docblock comment
This commit is contained in:
commit
2c1f349602
@ -12,7 +12,6 @@
|
|||||||
namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper;
|
namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper;
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use ProxyManager\Version;
|
|
||||||
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
|
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
|
||||||
use Symfony\Component\DependencyInjection\Definition;
|
use Symfony\Component\DependencyInjection\Definition;
|
||||||
use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
|
use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
|
||||||
|
@ -174,7 +174,7 @@ abstract class Descriptor implements DescriptorInterface
|
|||||||
/**
|
/**
|
||||||
* Describes a callable.
|
* Describes a callable.
|
||||||
*
|
*
|
||||||
* @param callable $callable
|
* @param mixed $callable
|
||||||
*/
|
*/
|
||||||
abstract protected function describeCallable($callable, array $options = []);
|
abstract protected function describeCallable($callable, array $options = []);
|
||||||
|
|
||||||
|
@ -200,9 +200,7 @@ class YamlDumper extends Dumper
|
|||||||
/**
|
/**
|
||||||
* Dumps callable to YAML format.
|
* Dumps callable to YAML format.
|
||||||
*
|
*
|
||||||
* @param callable $callable
|
* @param mixed $callable
|
||||||
*
|
|
||||||
* @return callable
|
|
||||||
*/
|
*/
|
||||||
private function dumpCallable($callable)
|
private function dumpCallable($callable)
|
||||||
{
|
{
|
||||||
|
@ -18,8 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
|
|||||||
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
|
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An implementation of BundleInterface that adds a few conventions
|
* An implementation of BundleInterface that adds a few conventions for DependencyInjection extensions.
|
||||||
* for DependencyInjection extensions and Console commands.
|
|
||||||
*
|
*
|
||||||
* @author Fabien Potencier <fabien@symfony.com>
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user