Update PHPStorm stubs and patch #3393
Conversation
VincentLanglet
force-pushed
the
updateStubs
branch
9 times, most recently
from
40ec86a to
6ae71fe
Compare
patches/BetterReflection.patch
Outdated
| { | ||
| $newStmts = []; | ||
| foreach ($stmts as $stmt) { | ||
| - assert($stmt instanceof Node\Stmt\ClassConst || $stmt instanceof Node\Stmt\Property || $stmt instanceof Node\Stmt\ClassMethod); |
There was a problem hiding this comment.
A fix need to be done in ondrejmirtes/better-reflection because @since is also use on enum
cf JetBrains/phpstorm-stubs@2630c46#diff-ef8aa905e0656e00a12783a18d25215a90772b1e75e3a18f3e4815ef9c68ccf4R41
but since it's a fork of Roave/BetterReflection I'm not sure how you deal with such situation @ondrejmirtes :
- Should I open a PR on your repo ?
- Should I open a PR on
Roave/BetterReflectiondirectly ? And you'll cherry-pick after the merge onRoave/BetterReflection? - Should I do both ?
There was a problem hiding this comment.
Just open it on Roave, I regularly rebase on top of them.
There was a problem hiding this comment.
My fix is merged on Roave Roave/BetterReflection@31b5dd1
Now, if you have time @ondrejmirtes, I need a rebase on your fork (and a new tag) in order to finish this PR :)
There was a problem hiding this comment.
@VincentLanglet Done, you can rebase and continue your work :)
There was a problem hiding this comment.
Thanks, I think the PR is ready then.
VincentLanglet
force-pushed
the
updateStubs
branch
2 times, most recently
from
91d67df to
fa18ed4
Compare
VincentLanglet
force-pushed
the
updateStubs
branch
from
fa18ed4 to
bbe969b
Compare
|
This pull request has been marked as ready for review. |
No description provided.