Merge branch '5.0' into 5.1
* 5.0: Relax tests to unlock change on master [DI] fix dumping deprecated private aliases [DI] fix typo in Preloader
This commit is contained in:
commit
0878dd4ac0
@ -29,14 +29,17 @@ class CachePoolClearerPassTest extends TestCase
|
||||
$container->setParameter('kernel.project_dir', 'foo');
|
||||
|
||||
$globalClearer = new Definition(Psr6CacheClearer::class);
|
||||
$globalClearer->setPublic(true);
|
||||
$container->setDefinition('cache.global_clearer', $globalClearer);
|
||||
|
||||
$publicPool = new Definition();
|
||||
$publicPool->setPublic(true);
|
||||
$publicPool->addArgument('namespace');
|
||||
$publicPool->addTag('cache.pool', ['clearer' => 'clearer_alias']);
|
||||
$container->setDefinition('public.pool', $publicPool);
|
||||
|
||||
$publicPool = new Definition();
|
||||
$publicPool->setPublic(true);
|
||||
$publicPool->addArgument('namespace');
|
||||
$publicPool->addTag('cache.pool', ['clearer' => 'clearer_alias', 'name' => 'pool2']);
|
||||
$container->setDefinition('public.pool2', $publicPool);
|
||||
@ -48,6 +51,7 @@ class CachePoolClearerPassTest extends TestCase
|
||||
$container->setDefinition('private.pool', $privatePool);
|
||||
|
||||
$clearer = new Definition();
|
||||
$clearer->setPublic(true);
|
||||
$container->setDefinition('clearer', $clearer);
|
||||
$container->setAlias('clearer_alias', 'clearer');
|
||||
|
||||
|
@ -104,7 +104,7 @@ final class Preloader
|
||||
self::preloadType($p->getType(), $preloaded);
|
||||
}
|
||||
|
||||
self::preloadType($p->getReturnType(), $preloaded);
|
||||
self::preloadType($m->getReturnType(), $preloaded);
|
||||
}
|
||||
} catch (\ReflectionException $e) {
|
||||
// ignore missing classes
|
||||
|
@ -179,8 +179,8 @@ class YamlDumper extends Dumper
|
||||
}
|
||||
}
|
||||
|
||||
if ($id->isPrivate()) {
|
||||
return sprintf(" %s: '@%s'\n%s", $alias, $id, $deprecated);
|
||||
if (!$id->isDeprecated() && $id->isPrivate()) {
|
||||
return sprintf(" %s: '@%s'\n", $alias, $id);
|
||||
}
|
||||
|
||||
return sprintf(" %s:\n alias: %s\n public: %s\n%s", $alias, $id, $id->isPublic() ? 'true' : 'false', $deprecated);
|
||||
|
@ -58,12 +58,14 @@ class FormPassTest extends TestCase
|
||||
|
||||
$extDefinition = $container->getDefinition('form.extension');
|
||||
|
||||
$locator = $extDefinition->getArgument(0);
|
||||
$this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
|
||||
$this->assertEquals(
|
||||
(new Definition(ServiceLocator::class, [[
|
||||
__CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),
|
||||
__CLASS__.'_Type2' => new ServiceClosureArgument(new Reference('my.type2')),
|
||||
]]))->addTag('container.service_locator')->setPublic(false),
|
||||
$extDefinition->getArgument(0)
|
||||
$locator->setPublic(false)
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -35,12 +35,14 @@ class AddConstraintValidatorsPassTest extends TestCase
|
||||
$addConstraintValidatorsPass = new AddConstraintValidatorsPass();
|
||||
$addConstraintValidatorsPass->process($container);
|
||||
|
||||
$locator = $container->getDefinition((string) $validatorFactory->getArgument(0));
|
||||
$this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
|
||||
$expected = (new Definition(ServiceLocator::class, [[
|
||||
Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
|
||||
'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
|
||||
Validator2::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service2')),
|
||||
]]))->addTag('container.service_locator')->setPublic(false);
|
||||
$this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
|
||||
$this->assertEquals($expected, $locator->setPublic(false));
|
||||
}
|
||||
|
||||
public function testAbstractConstraintValidator()
|
||||
|
Reference in New Issue
Block a user