Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
This reverts commit2f2d1aa053
, reversing changes made to07cf927237
.
This commit is contained in:
parent
45d449ce5b
commit
ed590ca16b
@ -29,13 +29,10 @@ class ResolveClassPass implements CompilerPassInterface
|
|||||||
if ($definition->isSynthetic() || null !== $definition->getClass()) {
|
if ($definition->isSynthetic() || null !== $definition->getClass()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (preg_match('/^\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $id)) {
|
if (preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $id)) {
|
||||||
if ($definition instanceof ChildDefinition && !class_exists($id)) {
|
if ($definition instanceof ChildDefinition && !class_exists($id)) {
|
||||||
throw new InvalidArgumentException(sprintf('Service definition "%s" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
|
throw new InvalidArgumentException(sprintf('Service definition "%s" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
|
||||||
}
|
}
|
||||||
if ('\\' === $id[0]) {
|
|
||||||
throw new InvalidArgumentException(sprintf('Service definition "%s" has no class, and its name looks like a FQCN but it starts with a backslash; remove the leading backslash.', $id));
|
|
||||||
}
|
|
||||||
$definition->setClass($id);
|
$definition->setClass($id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,6 @@ use PHPUnit\Framework\TestCase;
|
|||||||
use Symfony\Component\DependencyInjection\ChildDefinition;
|
use Symfony\Component\DependencyInjection\ChildDefinition;
|
||||||
use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
|
use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
|
||||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||||
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
|
|
||||||
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
|
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
|
||||||
|
|
||||||
class ResolveClassPassTest extends TestCase
|
class ResolveClassPassTest extends TestCase
|
||||||
@ -59,17 +58,6 @@ class ResolveClassPassTest extends TestCase
|
|||||||
yield ['\DateTime'];
|
yield ['\DateTime'];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testWontResolveClassFromClassIdWithLeadingBackslash()
|
|
||||||
{
|
|
||||||
$this->expectException(InvalidArgumentException::class);
|
|
||||||
$this->expectExceptionMessage('Service definition "\App\Some\Service" has no class, and its name looks like a FQCN but it starts with a backslash; remove the leading backslash.');
|
|
||||||
|
|
||||||
$container = new ContainerBuilder();
|
|
||||||
$container->register('\App\Some\Service');
|
|
||||||
|
|
||||||
(new ResolveClassPass())->process($container);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testNonFqcnChildDefinition()
|
public function testNonFqcnChildDefinition()
|
||||||
{
|
{
|
||||||
$container = new ContainerBuilder();
|
$container = new ContainerBuilder();
|
||||||
|
@ -1288,8 +1288,8 @@ class ContainerBuilderTest extends TestCase
|
|||||||
|
|
||||||
public function testNoClassFromNamespaceClassIdWithLeadingSlash()
|
public function testNoClassFromNamespaceClassIdWithLeadingSlash()
|
||||||
{
|
{
|
||||||
$this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
|
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
|
||||||
$this->expectExceptionMessage('Service definition "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class, and its name looks like a FQCN but it starts with a backslash; remove the leading backslash.');
|
$this->expectExceptionMessage('The definition for "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "Symfony\Component\DependencyInjection\Tests\FooClass" to get rid of this error.');
|
||||||
$container = new ContainerBuilder();
|
$container = new ContainerBuilder();
|
||||||
|
|
||||||
$container->register('\\'.FooClass::class);
|
$container->register('\\'.FooClass::class);
|
||||||
|
Reference in New Issue
Block a user