Commitf321d35

committed

Revert "bug#33092 [DependencyInjection] Improve an exception message (fabpot)"

This reverts commit2f2d1aa, reversingchanges made to07cf927.

1 parenta944f29 commitf321d35Copy full SHA for f321d35

File tree

-16

lines changed

src/Symfony/Component/DependencyInjection
- Compiler
  - ResolveClassPass.php
- Tests/Compiler
  - ResolveClassPassTest.php

-16

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,10 @@ public function process(ContainerBuilder $container)`
`29`	`29`	`if ($definition->isSynthetic() \|\|null !==$definition->getClass()) {`
`30`	`30`	`continue;`
`31`	`31`	`}`
`32`		`-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)) {`
	`32`	`+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)) {`
`33`	`33`	`if ($definitioninstanceof ChildDefinition && !class_exists($id)) {`
`34`	`34`	`thrownewInvalidArgumentException(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));`
`35`	`35`	`}`
`36`		`-if ('\\' ===$id[0]) {`
`37`		`-thrownewInvalidArgumentException(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));`
`38`		`- }`
`39`	`36`	`$definition->setClass($id);`
`40`	`37`	`}`
`41`	`38`	`}`

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`useSymfony\Component\DependencyInjection\ChildDefinition;`
`16`	`16`	`useSymfony\Component\DependencyInjection\Compiler\ResolveClassPass;`
`17`	`17`	`useSymfony\Component\DependencyInjection\ContainerBuilder;`
`18`		`-useSymfony\Component\DependencyInjection\Exception\InvalidArgumentException;`
`19`	`18`	`useSymfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;`
`20`	`19`
`21`	`20`	`class ResolveClassPassTestextends TestCase`
`@@ -59,17 +58,6 @@ public function provideInvalidClassId()`
`59`	`58`	`yield ['\DateTime'];`
`60`	`59`	`}`
`61`	`60`
`62`		`-publicfunctiontestWontResolveClassFromClassIdWithLeadingBackslash()`
`63`		`- {`
`64`		`-$this->expectException(InvalidArgumentException::class);`
`65`		`-$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.');`
`66`		`-`
`67`		`-$container =newContainerBuilder();`
`68`		`-$container->register('\App\Some\Service');`
`69`		`-`
`70`		`- (newResolveClassPass())->process($container);`
`71`		`- }`
`72`		`-`
`73`	`61`	`publicfunctiontestNonFqcnChildDefinition()`
`74`	`62`	`{`
`75`	`63`	`$container =newContainerBuilder();`

Comments

(0)