-
-
Notifications
You must be signed in to change notification settings - Fork 76
Add typed no default reflection property class usage #94
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
beberlei
merged 1 commit into
1.3.x
from
add_typed_no_default_reflection_property_class_usage
Jan 16, 2020
+106
−36
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
|---|---|---|
|
|
@@ -3,18 +3,30 @@ | |
| namespace Doctrine\Persistence\Mapping; | ||
|
|
||
| use Doctrine\Common\Reflection\RuntimePublicReflectionProperty; | ||
| use Doctrine\Common\Reflection\TypedNoDefaultReflectionProperty; | ||
| use ReflectionClass; | ||
| use ReflectionException; | ||
| use ReflectionMethod; | ||
| use ReflectionProperty; | ||
| use function array_key_exists; | ||
| use function class_exists; | ||
| use function class_parents; | ||
| use function phpversion; | ||
| use function version_compare; | ||
|
|
||
| /** | ||
| * PHP Runtime Reflection Service. | ||
| */ | ||
| class RuntimeReflectionService implements ReflectionService | ||
| { | ||
| /** @var bool */ | ||
| private $supportsTypedPropertiesWorkaround; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->supportsTypedPropertiesWorkaround = version_compare((string) phpversion(), '7.4.0') >= 0; | ||
|
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 suggest replacing this property with an inline |
||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
|
|
@@ -64,6 +76,8 @@ public function getAccessibleProperty($class, $property) | |
|
|
||
| if ($reflectionProperty->isPublic()) { | ||
| $reflectionProperty = new RuntimePublicReflectionProperty($class, $property); | ||
| } elseif ($this->supportsTypedPropertiesWorkaround && ! array_key_exists($property, $this->getClass($class)->getDefaultProperties())) { | ||
| $reflectionProperty = new TypedNoDefaultReflectionProperty($class, $property); | ||
| } | ||
|
|
||
| $reflectionProperty->setAccessible(true); | ||
|
|
||
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
53 changes: 53 additions & 0 deletions
53
tests/Doctrine/Tests_PHP74/Persistence/Mapping/RuntimeReflectionServiceTest.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,53 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Doctrine\Tests_PHP74\Persistence\Mapping; | ||
|
|
||
| use Doctrine\Common\Reflection\RuntimePublicReflectionProperty; | ||
| use Doctrine\Common\Reflection\TypedNoDefaultReflectionProperty; | ||
| use Doctrine\Persistence\Mapping\RuntimeReflectionService; | ||
| use PHPUnit\Framework\TestCase; | ||
| use ReflectionProperty; | ||
|
|
||
| /** | ||
| * @group DCOM-93 | ||
| */ | ||
| class RuntimeReflectionServiceTest extends TestCase | ||
| { | ||
| /** @var RuntimeReflectionService */ | ||
| private $reflectionService; | ||
|
|
||
| /** @var string */ | ||
| private string $typedNoDefaultProperty; | ||
| /** @var string */ | ||
| private string $typedDefaultProperty = ''; | ||
|
|
||
| /** @var string */ | ||
| public string $typedNoDefaultPublicProperty; | ||
|
|
||
| protected function setUp() : void | ||
| { | ||
| $this->reflectionService = new RuntimeReflectionService(); | ||
| } | ||
|
|
||
| public function testGetTypedNoDefaultReflectionProperty() : void | ||
| { | ||
| $reflProp = $this->reflectionService->getAccessibleProperty(self::class, 'typedNoDefaultProperty'); | ||
| self::assertInstanceOf(TypedNoDefaultReflectionProperty::class, $reflProp); | ||
| } | ||
|
|
||
| public function testGetTypedDefaultReflectionProperty() : void | ||
| { | ||
| $reflProp = $this->reflectionService->getAccessibleProperty(self::class, 'typedDefaultProperty'); | ||
| self::assertInstanceOf(ReflectionProperty::class, $reflProp); | ||
| self::assertNotInstanceOf(TypedNoDefaultReflectionProperty::class, $reflProp); | ||
| } | ||
|
|
||
| public function testGetTypedPublicNoDefaultPropertyWorksWithGetValue() : void | ||
| { | ||
| $reflProp = $this->reflectionService->getAccessibleProperty(self::class, 'typedNoDefaultPublicProperty'); | ||
| self::assertInstanceOf(RuntimePublicReflectionProperty::class, $reflProp); | ||
| self::assertNull($reflProp->getValue($this)); | ||
| } | ||
| } |
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noting that this is required for a fix. Since this transitive dependency fixes the issue for ORM, we've decided to bump this in a patch release.