Merge 2.13.x into 3.1.x #4823
Merged
Merge 2.13.x into 3.1.x #4823
Conversation
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
Do not normalize current version during comparison
Signed-off-by: Alexander M. Turek <me@derrabus.de>
Bump PHPStan and PHPUnit
Signed-off-by: Alexander M. Turek <me@derrabus.de>
PHPUnit 9.5.10
* 2.13.x: PHPUnit 9.5.10 Bump PHPStan and PHPUnit Do not normalize current version during comparison
Signed-off-by: Alexander M. Turek <me@derrabus.de>
derrabus
commented
Sep 28, 2021
| @@ -101,7 +101,7 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le | |||
|
|
|||
| assert($lob !== false); | |||
|
|
|||
| $lob->writetemporary($variable, OCI_TEMP_BLOB); | |||
| $lob->writeTemporary($variable, OCI_TEMP_BLOB); | |||
There was a problem hiding this comment.
After the bump, PHPStan started to complain about this line. I've pushed a commit to make PHPStan happy again.
There was a problem hiding this comment.
I remember changing it a few times back and forth. This time, it should be related to php/php-src#7405.
There was a problem hiding this comment.
Yes, probably. Thanks for the hint.
greg0ire
approved these changes
Sep 28, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.