Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork9.7k
[DependencyInjection] Add ReflectionHelper for native or static reflection of class#18578
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Closed
Uh oh!
There was an error while loading.Please reload this page.
Closed
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
3 changes: 2 additions & 1 deletioncomposer.json
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
13 changes: 8 additions & 5 deletionssrc/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -16,6 +16,7 @@ | ||
| use Symfony\Component\DependencyInjection\Definition; | ||
| use Symfony\Component\DependencyInjection\Exception\RuntimeException; | ||
| use Symfony\Component\DependencyInjection\Reference; | ||
| use Symfony\Component\DependencyInjection\Util\ReflectionHelper; | ||
| /** | ||
| * Guesses constructor arguments of services definitions and try to instantiate services if necessary. | ||
| @@ -29,6 +30,12 @@ class AutowirePass implements CompilerPassInterface | ||
| private $definedTypes = array(); | ||
| private $types; | ||
| private $ambiguousServiceTypes = array(); | ||
| private $reflectionHelper; | ||
| public function __construct(ReflectionHelper $reflectionHelper = null) | ||
Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Instead of injecting an object, I suggest a string: ContributorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. No, because is neccessary to call | ||
| { | ||
| $this->reflectionHelper = $reflectionHelper ?: new ReflectionHelper(); | ||
| } | ||
| /** | ||
| * {@inheritdoc} | ||
| @@ -293,11 +300,7 @@ private function getReflectionClass($id, Definition $definition) | ||
| $class = $this->container->getParameterBag()->resolveValue($class); | ||
| return $this->reflectionClasses[$id] = $this->reflectionHelper->getReflectionClass($class); | ||
| } | ||
| private function addServiceToAmbiguousType($id, $type) | ||
19 changes: 19 additions & 0 deletionssrc/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
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
18 changes: 18 additions & 0 deletionssrc/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?php | ||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| namespace Symfony\Component\DependencyInjection\Tests\Compiler; | ||
| use Symfony\Bug\NotExistClass; | ||
| class OptionalServiceClass extends NotExistClass | ||
| { | ||
| } |
88 changes: 88 additions & 0 deletionssrc/Symfony/Component/DependencyInjection/Util/ReflectionHelper.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?php | ||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| namespace Symfony\Component\DependencyInjection\Util; | ||
| use Go\ParserReflection\ReflectionClass; | ||
| /** | ||
| * ReflectionHelper provides method for native or static reflection of class. | ||
| * | ||
| * @author Martin Hasoň <martin.hason@gmail.com> | ||
| */ | ||
| class ReflectionHelper | ||
| { | ||
| private static $staticReflection = false; | ||
| private static $reflections = array(); | ||
| private $existsGoAopReflection; | ||
| public function __construct() | ||
| { | ||
| $this->existsGoAopReflection = class_exists(ReflectionClass::class); | ||
| } | ||
| public static function preferStaticReflection($use) | ||
| { | ||
| $oldSetup = self::$staticReflection; | ||
| self::$staticReflection = (bool) $use; | ||
| return $oldSetup; | ||
| } | ||
| /** | ||
| * Returns reflection instance for class. | ||
| * | ||
| * @param string $class Full name of the class | ||
| * | ||
| * @return \ReflectionClass|false | ||
| */ | ||
| public function getReflectionClass($class) | ||
| { | ||
| if (isset(self::$reflections[$class])) { | ||
| return self::$reflections[$class]; | ||
| } | ||
| if (!self::$staticReflection || class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) { | ||
| return $this->getNativeReflection($class); | ||
| } | ||
| if ($this->existsGoAopReflection) { | ||
| return $this->getGoParserReflection($class); | ||
| } | ||
| return $this->getNativeReflection($class); | ||
| } | ||
| private function getNativeReflection($class) | ||
| { | ||
| try { | ||
| $reflector = self::$reflections[$class] = new \ReflectionClass($class); | ||
| } catch (\ReflectionException $e) { | ||
| $reflector = false; | ||
| } | ||
| return self::$reflections[$class] = $reflector; | ||
| } | ||
| private function getGoParserReflection($class) | ||
| { | ||
| try { | ||
| $reflectionClass = new ReflectionClass($class); | ||
| $reflectionClass->__toString(); // checks that reflection is complete and valid | ||
Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I don't get this line: if it checks something, ContributorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Personally, I don't like this trick with | ||
| $reflector = self::$reflections[$class] = $reflectionClass; | ||
| } catch (\InvalidArgumentException $e) { | ||
| $reflector = false; | ||
| } | ||
| return self::$reflections[$class] = $reflector; | ||
| } | ||
| } | ||
6 changes: 4 additions & 2 deletionssrc/Symfony/Component/DependencyInjection/composer.json
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
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.