Skip to content
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.

Sign up for GitHub

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

Merge 2.13.x into 3.1.x #4823

Merged
merged 8 commits into from
Sep 28, 2021
Merged

Merge 2.13.x into 3.1.x #4823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41cb3ed
Do not normalize current version during comparison
morozov Sep 12, 2021
5457b09
Merge pull request #4792 from morozov/issues/4367
morozov Sep 12, 2021
f6cc2ed
Bump PHPStan and PHPUnit
derrabus Sep 15, 2021
41a7ec6
Merge pull request #4796 from derrabus/bump/tools
derrabus Sep 15, 2021
a6f2c69
PHPUnit 9.5.10
derrabus Sep 27, 2021
4990b43
Merge pull request #4819 from derrabus/bump/phpunit
derrabus Sep 27, 2021
a5ef3d2
Merge branch '2.13.x' into merge/2.13.x
derrabus Sep 28, 2021
5a1fbe4
Fix method casing
derrabus Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
"phpstan/phpstan": "0.12.96",
"phpstan/phpstan": "0.12.99",
"phpstan/phpstan-strict-rules": "^0.12.11",
"phpunit/phpunit": "9.5.5",
"phpunit/phpunit": "9.5.10",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.0",
"symfony/cache": "^5.2|^6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/OCI8/Statement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the bump, PHPStan started to complain about this line. I've pushed a commit to make PHPStan happy again.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember changing it a few times back and forth. This time, it should be related to php/php-src#7405.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, probably. Thanks for the hint.


$variable =& $lob;
}
Expand Down