diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #27025 [DI] Add check of internal type to ContainerBuilder::getReflectionClass (upyx)

Browse Source 
This PR was submitted for the 4.0 branch but it was merged into the 3.4 branch instead (closes #27025).

Discussion
----------

[DI] Add check of internal type to ContainerBuilder::getReflectionClass

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #27018
| License       | MIT
| Doc PR        | no

This PR fixes bug described in #27018 issue.
I think that `getReflectionClass` should return `NULL` when internal type was used instead class name but not throws exception. As well as it does when class is empty. If someone have other opinion we can discuss it.

Commits
-------

314e8813b3 [DI] Add check of internal type to ContainerBuilder::getReflectionClass
This commit is contained in:
Christophe Coevoet 2018-04-24 12:28:46 +02:00
commit aec5cd0c75
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -124,6 +124,20 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
private $removedIds = array();
private $alreadyLoading = array();
private static $internalTypes = array(
'int' => true,
'float' => true,
'string' => true,
'bool' => true,
'resource' => true,
'object' => true,
'array' => true,
'null' => true,
'callable' => true,
'iterable' => true,
'mixed' => true,
);
public function __construct(ParameterBagInterface $parameterBag = null)
{
parent::__construct($parameterBag);
@ -341,6 +355,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
if (!$class = $this->getParameterBag()->resolveValue($class)) {
return;
}
if (isset(self::$internalTypes[$class])) {
return null;
}
$resource = null;
try {

17
src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
View File

@ -906,6 +906,23 @@ class ContainerBuilderTest extends TestCase
$this->assertSame('BarMissingClass', (string) end($resources));
}
public function testGetReflectionClassOnInternalTypes()
{
$container = new ContainerBuilder();
$this->assertNull($container->getReflectionClass('int'));
$this->assertNull($container->getReflectionClass('float'));
$this->assertNull($container->getReflectionClass('string'));
$this->assertNull($container->getReflectionClass('bool'));
$this->assertNull($container->getReflectionClass('resource'));
$this->assertNull($container->getReflectionClass('object'));
$this->assertNull($container->getReflectionClass('array'));
$this->assertNull($container->getReflectionClass('null'));
$this->assertNull($container->getReflectionClass('callable'));
$this->assertNull($container->getReflectionClass('iterable'));
$this->assertNull($container->getReflectionClass('mixed'));
}
public function testCompilesClassDefinitionsOfLazyServices()
{
$container = new ContainerBuilder();