[DependencyInjection] Tweaked factories #12065
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
562b870 to
4264436
Compare
| @@ -618,8 +617,7 @@ private function addService($id, $definition) | |||
| $this->addServiceMethodCalls($id, $definition). | |||
| $this->addServiceProperties($id, $definition). | |||
| $this->addServiceConfigurator($id, $definition). | |||
| $this->addServiceReturn($id, $definition) | |||
| ; | |||
| $this->addServiceReturn($id, $definition); | |||
There was a problem hiding this comment.
Sorry about that but PHP-CS-Fixer is buggy here. The previous code was "better". Can you revert this one and the other one as well. Thanks.
4264436 to
cf905b7
Compare
|
if ($definition->isSynthetic()) {
$return[] = '@throws RuntimeException always since this service is expected to be injected dynamically';
} elseif ($class = $definition->getClass()) {
$return[] = sprintf("@return %s A %s instance.", 0 === strpos($class, '%') ? 'object' : "\\".$class, $class);
} elseif ($definition->getFactory()) {
$factory = $definition->getFactory();
if (is_string($factory)) {
$return[] = sprintf('@return object An instance returned by %s().', $factory);
} elseif (is_array($factory) && (is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
if (is_string($factory[0]) || $factory[0] instanceof Reference) {
$return[] = sprintf('@return object An instance returned by %s::%s().', (string) $factory[0], $factory[1]);
} elseif ($factory[0] instanceof Definition) {
$return[] = sprintf('@return object An instance returned by %s::%s().', $factory[0]->getClass(), $factory[1]);
}
}
} elseif ($definition->getFactoryClass()) {
$return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryClass(), $definition->getFactoryMethod());
} elseif ($definition->getFactoryService()) {
$return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryService(), $definition->getFactoryMethod());
}I thought it is not allowed to define service without |
|
I'll fix tests later. |
|
👍 once tests are fixed |
| @@ -955,6 +955,18 @@ public function createService(Definition $definition, $id, $tryProxy = true) | |||
| } | |||
|
|
|||
| $service = call_user_func_array(array($factory, $definition->getFactoryMethod()), $arguments); | |||
| } elseif (null !== $definition->getFactory()) { | |||
There was a problem hiding this comment.
the factory should win over the factory method, to be consistent with the code generated for dumped containers
|
Please also add a test instantiating a service with a factory in the ContainerBuilder (well, several to cover the different cases) |
b6ee1f8 to
d9f2720
Compare
|
Sorry for delay, tests have been updated. |
d9f2720 to
ee82392
Compare
|
Looks good to me @unkind. This is merged now. Thanks. |
fabpot
added a commit
that referenced
this pull request
Oct 3, 2014
This PR was merged into the 2.6-dev branch. Discussion ---------- [DependencyInjection] Tweaked factories | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12008 | License | MIT | Doc PR | n/a There are some issues with new service factories: * `ContainerBuilder` cannot instantiate service from factory (i.e. currently it works for dumped code only) * Dumped code sometimes is invalid (anonymous services as factories, factories without arguments) Commits ------- ee82392 [DependencyInjection] Tweaked factories
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are some issues with new service factories:
ContainerBuildercannot instantiate service from factory (i.e. currently it works for dumped code only)