-
Notifications
You must be signed in to change notification settings - Fork 453
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
Don't get repository at construction time, it could be not loaded yet! #574
Open
fullbl
wants to merge
7
commits into
FriendsOfSymfony:master
Choose a base branch
from
fullbl:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4d9cb9d
Don't get repository at construction time, it could be not loaded yet!
eedfce1
codestyle
c4a4e2a
we can't have retrocompatibility, __get is allowed only to be public
ea47351
force EntityRepository
37571cf
fix tests
b1271e1
phpstan
1d895fb
Update Client Manager
GuilhemN 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 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 |
---|---|---|
|
@@ -25,27 +25,30 @@ class TokenManager extends BaseTokenManager | |
*/ | ||
protected $em; | ||
|
||
/** | ||
* @var EntityRepository | ||
*/ | ||
protected $repository; | ||
|
||
/** | ||
* @var string | ||
*/ | ||
protected $class; | ||
|
||
public function __construct(EntityManagerInterface $em, $class) | ||
{ | ||
// NOTE: bug in Doctrine, hinting EntityRepository|ObjectRepository when only EntityRepository is expected | ||
/** @var EntityRepository $repository */ | ||
$repository = $em->getRepository($class); | ||
|
||
$this->em = $em; | ||
$this->repository = $repository; | ||
$this->class = $class; | ||
} | ||
|
||
/** | ||
* retrocompatibility with old $repository property. | ||
* @param $name | ||
* @return mixed | ||
*/ | ||
public function __get($name) | ||
{ | ||
if ('repository' === $name) { | ||
return $this->getRepository(); | ||
} | ||
|
||
return $this->$name; | ||
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. should not allow access. This gives public access to private properties 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. Removed! |
||
} | ||
/** | ||
* {@inheritdoc} | ||
*/ | ||
|
@@ -59,7 +62,7 @@ public function getClass() | |
*/ | ||
public function findTokenBy(array $criteria) | ||
{ | ||
return $this->repository->findOneBy($criteria); | ||
return $this->getRepository()->findOneBy($criteria); | ||
} | ||
|
||
/** | ||
|
@@ -85,7 +88,7 @@ public function deleteToken(TokenInterface $token) | |
*/ | ||
public function deleteExpired() | ||
{ | ||
$qb = $this->repository->createQueryBuilder('t'); | ||
$qb = $this->getRepository()->createQueryBuilder('t'); | ||
$qb | ||
->delete() | ||
->where('t.expiresAt < ?1') | ||
|
@@ -94,4 +97,12 @@ public function deleteExpired() | |
|
||
return $qb->getQuery()->execute(); | ||
} | ||
|
||
/** | ||
* @return EntityRepository | ||
*/ | ||
protected function getRepository(): EntityRepository | ||
{ | ||
return $this->em->getRepository($this->class); | ||
} | ||
} |
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.
should not be public to provide BC with a protected property.
and it should trigger a deprecation warning
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.
__get can only be public... I can't think a method to provide retrocompatibility for private property.