Improve PHP-DI/PHP-DI#616 #1
Conversation
| } | ||
|
|
||
| $this->setClassName($className); | ||
| } |
There was a problem hiding this comment.
I've moved the logic of replacing wildcards into this class, that allows for unit tests and a simpler code in DefinitionArray. This is not directly related to your bugfix but it improves the code a bit I think.
| $this->replaceWildcards($definition->getClassName(), $matches) | ||
| ); | ||
| $definition = $this->normalizer->normalizeRootDefinition($definition, $name); | ||
| } |
There was a problem hiding this comment.
I've reworked this code so that $this->normalizer->normalizeRootDefinition($definition, $name) isn't called twice. This is now the normalizer that takes care of replacing wildcards.
| $this->assertInstanceOf(Implementation1::class, $object); | ||
|
|
||
| self::assertEntryIsNotCompiled($container, Interface1::class); | ||
| } |
There was a problem hiding this comment.
I've added this test just to be sure it works ^^ (not related to your bug)
| self::assertEntryIsNotCompiled($container, 'DI\Test\IntegrationTest\*\Interface*'); | ||
| self::assertEntryIsNotCompiled($container, Interface1::class); | ||
| self::assertEntryIsNotCompiled($container, Interface2::class); | ||
| } |
There was a problem hiding this comment.
I've added a simpler version of your test: this test passes on the current master. I think this is better to have a simple test (easy to grasp) which covers the base of the feature + your test that is more advanced and covers the bug you were facing.
| $definition = new ObjectDefinition('Foo\Bar\Baz'); | ||
| $definition->replaceWildcards(['1', '2', '3']); | ||
| $this->assertEquals('Foo\Bar\Baz', $definition->getClassName()); | ||
| } |
There was a problem hiding this comment.
With those unit tests I can sleep better now ;)
This pull request adds suggested improvements to PHP-DI#616
I'll detail inline.