Skip to content

Commit bf12209

Browse files
committed
Stop testing PHP 7.2 and 7.3
1 parent 767698a commit bf12209

6 files changed

+7
-66
lines changed

.github/workflows/build.yml

-20
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
php-version:
20-
- "7.2"
21-
- "7.3"
2220
- "7.4"
2321
- "8.0"
2422
- "8.1"
@@ -45,10 +43,6 @@ jobs:
4543
if: matrix.php-version == '8.4'
4644
run: "composer config platform.php 8.3.99"
4745

48-
- name: "Downgrade PHPUnit"
49-
if: matrix.php-version == '7.2' || matrix.php-version == '7.3'
50-
run: "composer require --dev phpunit/phpunit:^8.5.31 --no-update --update-with-dependencies"
51-
5246
- name: "Install dependencies"
5347
run: "composer install --no-interaction --no-progress"
5448

@@ -103,8 +97,6 @@ jobs:
10397
fail-fast: false
10498
matrix:
10599
php-version:
106-
- "7.2"
107-
- "7.3"
108100
- "7.4"
109101
- "8.0"
110102
- "8.1"
@@ -139,18 +131,10 @@ jobs:
139131
if: matrix.php-version == '8.4'
140132
run: "composer config platform.php 8.3.99"
141133

142-
- name: "Downgrade PHPUnit"
143-
if: matrix.php-version == '7.2' || matrix.php-version == '7.3'
144-
run: "composer require --dev phpunit/phpunit:^8.5.31 --no-update --update-with-dependencies"
145-
146134
- name: "Install lowest dependencies"
147135
if: ${{ matrix.dependencies == 'lowest' }}
148136
run: "composer update --prefer-lowest --no-interaction --no-progress"
149137

150-
- name: "Update Doctrine DBAl to ^3"
151-
if: matrix.php-version != '7.2' && matrix.dependencies == 'lowest'
152-
run: "composer require --dev doctrine/dbal:^3.3.8 --no-interaction --no-progress"
153-
154138
- name: "Install highest dependencies"
155139
if: ${{ matrix.dependencies == 'highest' }}
156140
run: "composer update --no-interaction --no-progress"
@@ -198,10 +182,6 @@ jobs:
198182
if: matrix.php-version == '8.4'
199183
run: "composer config platform.php 8.3.99"
200184

201-
- name: "Downgrade PHPUnit"
202-
if: matrix.php-version == '7.2' || matrix.php-version == '7.3'
203-
run: "composer require --dev phpunit/phpunit:^8.5.31 --no-update --update-with-dependencies"
204-
205185
- name: "Install dependencies"
206186
run: "composer update --no-interaction --no-progress"
207187

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"cache/array-adapter": "^1.1",
2121
"composer/semver": "^3.3.2",
2222
"cweagans/composer-patches": "^1.7.3",
23-
"doctrine/annotations": "^1.11 || ^2.0",
24-
"doctrine/collections": "^1.6 || ^2.1",
23+
"doctrine/annotations": "^2.0",
24+
"doctrine/collections": "^2.1",
2525
"doctrine/common": "^2.7 || ^3.0",
26-
"doctrine/dbal": "^2.13.8 || ^3.3.3",
27-
"doctrine/lexer": "^2.0 || ^3.0",
28-
"doctrine/mongodb-odm": "^1.3 || ^2.4.3",
26+
"doctrine/dbal": "^3.3.8",
27+
"doctrine/lexer": "^3.0",
28+
"doctrine/mongodb-odm": "^2.4.3",
2929
"doctrine/orm": "^2.16.0",
3030
"doctrine/persistence": "^2.2.1 || ^3.2",
3131
"gedmo/doctrine-extensions": "^3.8",

tests/Type/Doctrine/DBAL/MysqliResultRowCountReturnTypeTest.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ public function dataFileAsserts(): iterable
1515
$versionParser = new VersionParser();
1616
if (InstalledVersions::satisfies($versionParser, 'doctrine/dbal', '>=4.0')) {
1717
yield from $this->gatherAssertTypes(__DIR__ . '/data/mysqli-result-row-count.php');
18-
} elseif (InstalledVersions::satisfies($versionParser, 'doctrine/dbal', '>=3.0')) {
19-
yield from $this->gatherAssertTypes(__DIR__ . '/data/mysqli-result-row-count-dbal-3.php');
2018
} else {
21-
yield from $this->gatherAssertTypes(__DIR__ . '/data/mysqli-result-row-count-dbal-2.php');
19+
yield from $this->gatherAssertTypes(__DIR__ . '/data/mysqli-result-row-count-dbal-3.php');
2220
}
2321
}
2422

tests/Type/Doctrine/DBAL/PDOResultRowCountReturnTypeTest.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace PHPStan\Type\Doctrine\DBAL;
44

5-
use Composer\InstalledVersions;
6-
use Composer\Semver\VersionParser;
75
use PHPStan\Testing\TypeInferenceTestCase;
86

97
class PDOResultRowCountReturnTypeTest extends TypeInferenceTestCase
@@ -12,12 +10,7 @@ class PDOResultRowCountReturnTypeTest extends TypeInferenceTestCase
1210
/** @return iterable<mixed> */
1311
public function dataFileAsserts(): iterable
1412
{
15-
$versionParser = new VersionParser();
16-
if (InstalledVersions::satisfies($versionParser, 'doctrine/dbal', '<3')) {
17-
yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-result-row-count-dbal-2.php');
18-
} else {
19-
yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-result-row-count.php');
20-
}
13+
yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-result-row-count.php');
2114
}
2215

2316
/**

tests/Type/Doctrine/DBAL/data/mysqli-result-row-count-dbal-2.php

-15
This file was deleted.

tests/Type/Doctrine/DBAL/data/pdo-result-row-count-dbal-2.php

-15
This file was deleted.

0 commit comments

Comments
 (0)