[ExpressionLanguage] Fixed PhpDoc type-hints on Token value #24884
Conversation
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
Tobion
suggested changes
Nov 10, 2017
85ac690 to
db5a4d8
Compare
|
Thanks for review, I changed the phpdoc and added a test to cover this. |
stof
requested changes
Nov 10, 2017
| * @param string $value The token value | ||
| * @param int $cursor The cursor position in the source | ||
| * @param string $type The type of the token (self::*_TYPE) | ||
| * @param string|int|float $value The token value |
There was a problem hiding this comment.
|null as the previous typehint was nullable too
There was a problem hiding this comment.
I added null because scalar seems to not be recognize and I could not find it in php doc @nicolas-grekas
nicolas-grekas
approved these changes
Nov 10, 2017
|
PhpDoc and tests can effectively be merged in lower branch version. But removing the typeHint is a 4.0 issue... Should I open an other PR on a lower branch? @nicolas-grekas |
|
Removing the type will come naturally when merging up to master I think. |
Also added tests to cover number parser BC
|
I moved it to lower active branch 2.7. |
nicolas-grekas
approved these changes
Nov 11, 2017
fabpot
approved these changes
Nov 12, 2017
|
Thank you @mcg-web. |
fabpot
added a commit
that referenced
this pull request
Nov 12, 2017
…lue (mcg-web) This PR was merged into the 2.7 branch. Discussion ---------- [ExpressionLanguage] Fixed PhpDoc type-hints on Token value | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | none Fixed PhpDoc type-hints on Token value and added test to prevent BC with Parser when treating numbers (example `a === 123` compile as `$a === "123"`) Commits ------- 18f0fc5 [ExpressionLanguage] Fix PhpDoc type-hints on Token value
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixed PhpDoc type-hints on Token value and added test to prevent BC with Parser when treating numbers (example
a === 123compile as$a === "123")