Merge branch '4.2'
* 4.2: [WIP] [DependencyInjection] Fix a wrong error when using a factory and a call Fix table trailing backslash
This commit is contained in:
commit
f0786bb3d8
@ -13,6 +13,7 @@ namespace Symfony\Component\Console\Helper;
|
||||
|
||||
use Symfony\Component\Console\Exception\InvalidArgumentException;
|
||||
use Symfony\Component\Console\Exception\RuntimeException;
|
||||
use Symfony\Component\Console\Formatter\OutputFormatter;
|
||||
use Symfony\Component\Console\Formatter\WrappableOutputFormatterInterface;
|
||||
use Symfony\Component\Console\Output\ConsoleSectionOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
@ -528,6 +529,8 @@ class Table
|
||||
if (!strstr($cell, "\n")) {
|
||||
continue;
|
||||
}
|
||||
$escaped = implode("\n", array_map([OutputFormatter::class, 'escapeTrailingBackslash'], explode("\n", $cell)));
|
||||
$cell = $cell instanceof TableCell ? new TableCell($escaped, ['colspan' => $cell->getColspan()]) : $escaped;
|
||||
$lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
|
||||
foreach ($lines as $lineKey => $line) {
|
||||
if ($cell instanceof TableCell) {
|
||||
|
@ -1072,6 +1072,26 @@ TABLE
|
||||
| | ities | | |
|
||||
+---------------+-------+------------+-----------------+
|
||||
|
||||
TABLE;
|
||||
|
||||
$this->assertEquals($expected, $this->getOutputContent($output));
|
||||
}
|
||||
|
||||
public function testColumnMaxWidthsWithTrailingBackslash()
|
||||
{
|
||||
(new Table($output = $this->getOutputStream()))
|
||||
->setColumnMaxWidth(0, 5)
|
||||
->setRows([['1234\6']])
|
||||
->render()
|
||||
;
|
||||
|
||||
$expected =
|
||||
<<<'TABLE'
|
||||
+-------+
|
||||
| 1234\ |
|
||||
| 6 |
|
||||
+-------+
|
||||
|
||||
TABLE;
|
||||
|
||||
$this->assertEquals($expected, $this->getOutputContent($output));
|
||||
|
@ -158,7 +158,15 @@ class AutowirePass extends AbstractRecursivePass
|
||||
if ($method instanceof \ReflectionFunctionAbstract) {
|
||||
$reflectionMethod = $method;
|
||||
} else {
|
||||
$reflectionMethod = $this->getReflectionMethod(new Definition($reflectionClass->name), $method);
|
||||
$definition = new Definition($reflectionClass->name);
|
||||
try {
|
||||
$reflectionMethod = $this->getReflectionMethod($definition, $method);
|
||||
} catch (RuntimeException $e) {
|
||||
if ($definition->getFactory()) {
|
||||
continue;
|
||||
}
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
||||
$arguments = $this->autowireMethod($reflectionMethod, $arguments);
|
||||
|
@ -115,7 +115,14 @@ class ResolveBindingsPass extends AbstractRecursivePass
|
||||
if ($method instanceof \ReflectionFunctionAbstract) {
|
||||
$reflectionMethod = $method;
|
||||
} else {
|
||||
$reflectionMethod = $this->getReflectionMethod($value, $method);
|
||||
try {
|
||||
$reflectionMethod = $this->getReflectionMethod($value, $method);
|
||||
} catch (RuntimeException $e) {
|
||||
if ($value->getFactory()) {
|
||||
continue;
|
||||
}
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($reflectionMethod->getParameters() as $key => $parameter) {
|
||||
|
@ -26,6 +26,7 @@ use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
|
||||
use Symfony\Component\DependencyInjection\TypedReference;
|
||||
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
||||
|
||||
require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
|
||||
|
||||
@ -545,6 +546,18 @@ class AutowirePassTest extends TestCase
|
||||
);
|
||||
}
|
||||
|
||||
public function testWithNonExistingSetterAndAutowiring()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class)->setAutowired(true);
|
||||
$definition->addMethodCall('setLogger');
|
||||
$this->expectException(RuntimeException::class);
|
||||
(new ResolveClassPass())->process($container);
|
||||
(new AutowireRequiredMethodsPass())->process($container);
|
||||
(new AutowirePass())->process($container);
|
||||
}
|
||||
|
||||
public function testExplicitMethodInjection()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
@ -16,11 +16,14 @@ use Symfony\Component\DependencyInjection\Argument\BoundArgument;
|
||||
use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
|
||||
use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
|
||||
use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
|
||||
use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
|
||||
use Symfony\Component\DependencyInjection\TypedReference;
|
||||
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
||||
|
||||
require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
|
||||
|
||||
@ -112,6 +115,23 @@ class ResolveBindingsPassTest extends TestCase
|
||||
$this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
|
||||
}
|
||||
|
||||
public function testWithNonExistingSetterAndBinding()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$bindings = [
|
||||
'$c' => (new Definition('logger'))->setFactory('logger'),
|
||||
];
|
||||
|
||||
$definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class);
|
||||
$definition->addMethodCall('setLogger');
|
||||
$definition->setBindings($bindings);
|
||||
$this->expectException(RuntimeException::class);
|
||||
|
||||
$pass = new ResolveBindingsPass();
|
||||
$pass->process($container);
|
||||
}
|
||||
|
||||
public function testTupleBinding()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
Reference in New Issue
Block a user