8000 generated factories: fix return type by matej21 · Pull Request #152 · nette/di · GitHub
[go: up one dir, main page]
Skip to content

generated factories: fix return type #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dg merged 1 commit into from
Apr 12, 2017
Merged

generated factories: fix return type #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/DI/PhpGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
namespace Nette\DI;

use Nette;
use Nette\Utils\Validators;
use Nette\Utils\Strings;
use Nette\PhpGenerator\Helpers as PhpHelpers;
use Nette\PhpGenerator\PhpLiteral;
use ReflectionClass;
use Nette\Utils\Reflection;


/**
Expand Down Expand Up @@ -150,10 +149,12 @@ private function generateService(string $name): string
->addParameter('container')
->setTypeHint($this->className);

$rm = new \ReflectionMethod($def->getImplement(), $def->getImplementMode());

$factoryClass->addMethod($def->getImplementMode())
->setParameters($this->convertParameters($def->parameters))
->setBody(str_replace('$this', '$this->container', $code))
->setReturnType($def->getClass());
->setReturnType(Reflection::getReturnType($rm) ?: $def->getClass());

return 'return new class ($this) ' . $factoryClass . ';';
}
Expand Down
11 changes: 11 additions & 0 deletions tests/DI/Compiler.generatedFactory.returnTypes.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ class Article
}
}

class FooArticle extends Article
{

}

$compiler = new DI\Compiler;
$container = createContainer($compiler, 'files/compiler.generatedFactory.returnTypes.neon');

Expand All @@ -41,3 +46,9 @@ Assert::type(IArticleFactory::class, $container->getService('article2'));
$article = $container->getService('article2')->create('lorem-ipsum');
Assert::type(Article::class, $article);
Assert::same('lorem-ipsum', $article->title);


Assert::type(IArticleFactory::class, $container->getService('article3'));
$article = $container->getService('article3')->create('lorem-ipsum');
Assert::type(FooArticle::class, $article);
Assert::same('lorem-ipsum', $article->title);
4 changes: 4 additions & 0 deletions tests/DI/files/compiler.generatedFactory.returnTypes.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ services:
implement: IArticleFactory
arguments: [%title%]
parameters: [title]

article3:
implement: IArticleFactory
factory: FooArticle
0