Skip to content

Commit 6459738

Browse files
morozovmorozov
committed
Merge branch '3.9.x' into 3.10.x
2 parents 8b1e40a + 0f11e31 commit 6459738

10 files changed

+24
-24
lines changed

‎.github/workflows/coding-standards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ on:
2525
jobs:
2626
coding-standards:
2727
name: "Coding Standards"
28-
uses: "doctrine/.github/.github/workflows/[email protected].1"
28+
uses: "doctrine/.github/.github/workflows/[email protected].2"

‎.github/workflows/continuous-integration.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
matrix:
3737
os:
38-
- "ubuntu-22.04"
38+
- "ubuntu-24.04"
3939
php-version:
4040
- "7.4"
4141
- "8.4"
@@ -46,11 +46,11 @@ jobs:
4646
- "sqlite3"
4747
- "pdo_sqlite"
4848
include:
49-
- os: "ubuntu-20.04"
49+
- os: "ubuntu-22.04"
5050
php-version: "7.4"
5151
dependencies: "lowest"
5252
extension: "pdo_sqlite"
53-
- os: "ubuntu-22.04"
53+
- os: "ubuntu-24.04"
5454
php-version: "8.4"
5555
dependencies: "minimal"
5656
extension: "sqlite3"
@@ -99,7 +99,7 @@ jobs:
9999

100100
phpunit-oci8:
101101
name: "PHPUnit on OCI8"
102-
runs-on: "ubuntu-22.04"
102+
runs-on: "ubuntu-24.04"
103103
needs: "phpunit-smoke-check"
104104

105105
strategy:
@@ -158,7 +158,7 @@ jobs:
158158

159159
phpunit-pdo-oci:
160160
name: "PHPUnit on PDO_OCI"
161-
runs-on: "ubuntu-22.04"
161+
runs-on: "ubuntu-24.04"
162162
needs: "phpunit-smoke-check"
163163

164164
strategy:
@@ -217,7 +217,7 @@ jobs:
217217

218218
phpunit-postgres:
219219
name: "PHPUnit with PostgreSQL"
220-
runs-on: "ubuntu-22.04"
220+
runs-on: "ubuntu-24.04"
221221
needs: "phpunit-smoke-check"
222222

223223
strategy:
@@ -287,7 +287,7 @@ jobs:
287287

288288
phpunit-mariadb:
289289
name: "PHPUnit with MariaDB"
290-
runs-on: "ubuntu-22.04"
290+
runs-on: "ubuntu-24.04"
291291
needs: "phpunit-smoke-check"
292292

293293
strategy:
@@ -362,7 +362,7 @@ jobs:
362362

363363
phpunit-mysql:
364364
name: "PHPUnit with MySQL"
365-
runs-on: "ubuntu-22.04"
365+
runs-on: "ubuntu-24.04"
366366
needs: "phpunit-smoke-check"
367367

368368
strategy:
@@ -443,7 +443,7 @@ jobs:
443443

444444
phpunit-mssql:
445445
name: "PHPUnit with SQL Server"
446-
runs-on: "ubuntu-20.04"
446+
runs-on: "ubuntu-22.04"
447447
needs: "phpunit-smoke-check"
448448

449449
strategy:
@@ -510,7 +510,7 @@ jobs:
510510

511511
phpunit-ibm-db2:
512512
name: "PHPUnit with IBM DB2"
513-
runs-on: "ubuntu-22.04"
513+
runs-on: "ubuntu-24.04"
514514
needs: "phpunit-smoke-check"
515515

516516
strategy:
@@ -579,7 +579,7 @@ jobs:
579579

580580
development-deps:
581581
name: "PHPUnit with PDO_SQLite and development dependencies"
582-
runs-on: "ubuntu-22.04"
582+
runs-on: "ubuntu-24.04"
583583

584584
strategy:
585585
matrix:
@@ -608,7 +608,7 @@ jobs:
608608

609609
upload_coverage:
610610
name: "Upload coverage to Codecov"
611-
runs-on: "ubuntu-22.04"
611+
runs-on: "ubuntu-24.04"
612612
needs:
613613
- "phpunit-smoke-check"
614614
- "phpunit-oci8"

‎.github/workflows/documentation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
documentation:
1919
name: "Documentation"
20-
uses: "doctrine/.github/.github/workflows/[email protected].1"
20+
uses: "doctrine/.github/.github/workflows/[email protected].2"

‎.github/workflows/static-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ on:
2525
jobs:
2626
static-analysis-phpstan:
2727
name: "Static Analysis"
28-
uses: "doctrine/.github/.github/workflows/[email protected].1"
28+
uses: "doctrine/.github/.github/workflows/[email protected].2"

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
},
4141
"require-dev": {
4242
"doctrine/cache": "^1.11|^2.0",
43-
"doctrine/coding-standard": "12.0.0",
43+
"doctrine/coding-standard": "13.0.0",
4444
"fig/log-test": "^1",
4545
"jetbrains/phpstorm-stubs": "2023.1",
4646
"phpstan/phpstan": "2.1.1",
4747
"phpstan/phpstan-strict-rules": "^2",
4848
"phpunit/phpunit": "9.6.22",
49-
"slevomat/coding-standard": "8.13.1",
50-
"squizlabs/php_codesniffer": "3.10.2",
49+
"slevomat/coding-standard": "8.16.2",
50+
"squizlabs/php_codesniffer": "3.12.0",
5151
"symfony/cache": "^5.4|^6.0|^7.0",
5252
"symfony/console": "^4.4|^5.4|^6.0|^7.0"
5353
},

‎src/Driver/SQLSrv/Result.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function free(): void
106106
// @link http://php.net/manual/en/pdostatement.closecursor.php
107107
// @link https://github.com/php/php-src/blob/php-7.0.11/ext/pdo/pdo_stmt.c#L2075
108108
// deliberately do not consider multiple result sets, since doctrine/dbal doesn't support them
109-
while (sqlsrv_fetch($this->statement)) {
109+
while (sqlsrv_fetch($this->statement) === true) {
110110
}
111111
}
112112

‎src/Schema/SQLServerSchemaManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ protected function _getPortableTableColumnDefinition($tableColumn)
197197

198198
private function parseDefaultExpression(string $value): ?string
199199
{
200-
while (preg_match('/^\((.*)\)$/s', $value, $matches)) {
200+
while (preg_match('/^\((.*)\)$/s', $value, $matches) === 1) {
201201
$value = $matches[1];
202202
}
203203

‎tests/Functional/Driver/OCI8/ResultTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function testTruncatedFetch(
9696
$this->createOrReplacePipelinedFunction($expectedTotalRowCount + 10);
9797
}
9898

99-
while ($result->fetchOne()) {
99+
while ($result->fetchOne() !== false) {
100100
// Attempt to access all remaining rows from the original fetch
101101
// The rows locally cached from the default prefetch will first be used
102102
// but when the result attempts to get the remaining 10 rows beyond

‎tests/Functional/PortabilityTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public function testFullFetchMode(): void
3333

3434
$result = $this->connection->executeQuery('SELECT * FROM portability_table');
3535

36-
while (($row = $result->fetchAssociative())) {
36+
while (($row = $result->fetchAssociative()) !== false) {
3737
$this->assertFetchResultRow($row);
3838
}
3939

4040
$result = $this->connection
4141
->prepare('SELECT * FROM portability_table')
4242
->execute();
4343

44-
while (($row = $result->fetchAssociative())) {
44+
while (($row = $result->fetchAssociative()) !== false) {
4545
$this->assertFetchResultRow($row);
4646
}
4747
}

‎tests/FunctionalTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ final protected function disconnect(): void
6868
// (e.g. to drop a table), and then this reopened connection will remain open and attached to the PHPUnit result
6969
// until the end of the suite leaking connection resources, while subsequent tests will use
7070
// the newly established shared connection.
71-
unset($this->connection);
71+
unset($this->connection); // @phpstan-ignore unset.possiblyHookedProperty
7272

7373
$this->isConnectionReusable = true;
7474
}

0 commit comments

Comments
 (0)