Skip to content

Commit b6d327c

Browse files
authored
Merge pull request #80 from tflori/advance-requirements
Advance requirements
2 parents 9e3a283 + 52f087e commit b6d327c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
needs: [before]
1616
strategy:
1717
matrix:
18-
php-version: ["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]
18+
php-version: ["7.3", "7.4", "8.0", "8.1", "8.2"]
1919
name: PHP Unit Tests on PHP ${{ matrix.php-version }}
2020
runs-on: ubuntu-latest
2121
steps:
@@ -79,5 +79,5 @@ jobs:
7979

8080
- name: Report Coverage
8181
run: |
82-
cc-test-reporter sum-coverage coverage/cc-*.json -p 7 -o coverage/cc-total.json
82+
cc-test-reporter sum-coverage coverage/cc-*.json -p 5 -o coverage/cc-total.json
8383
cc-test-reporter upload-coverage -i coverage/cc-total.json

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "lightweight object relational mapper",
44
"license": "MIT",
55
"require": {
6-
"php": "^5.6 || ^7.0 || ^8.0",
6+
"php": "^7.3 || ^8.0",
77
"ext-json": "*",
88
"ext-mbstring": "*",
99
"ext-pdo": "*"

tests/EntityFetcher/BasicTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public function allReturnsLimitedAmount()
377377
public function columnsCantBeChanged()
378378
{
379379
$fetcher = $this->em->fetch(ContactPhone::class);
380-
$fetcher->columns(['a', 'b']);
380+
$fetcher->columns(['a', 'b']); // @phpstan-ignore-line
381381

382382
self::assertSame('SELECT DISTINCT t0.* FROM "contact_phone" AS t0', $fetcher->getQuery());
383383
}
@@ -539,7 +539,7 @@ public function joinRelatedCreatesJoinStatement($class, $relation, $statement)
539539

540540
$fetcher->joinRelated($relation);
541541

542-
self::assertRegExp(
542+
self::assertMatchesRegularExpression(
543543
'/SELECT DISTINCT t0\.\* FROM "[A-Za-z0-9_."]+" AS t0 JOIN ' . $statement . '/',
544544
$fetcher->getQuery()
545545
);
@@ -553,7 +553,7 @@ public function leftJoinRelatedCreatesLeftJoinStatement($class, $relation, $stat
553553

554554
$fetcher->leftJoinRelated($relation);
555555

556-
self::assertRegExp(
556+
self::assertMatchesRegularExpression(
557557
'/SELECT DISTINCT t0\.\* FROM "[A-Za-z0-9_."]+" AS t0 LEFT JOIN ' . $statement . '/',
558558
$fetcher->getQuery()
559559
);
@@ -576,7 +576,7 @@ public function chainedJoin()
576576

577577
$fetcher->joinRelated('relation')->joinRelated('relation.contactPhones');
578578

579-
self::assertRegExp(
579+
self::assertMatchesRegularExpression(
580580
'/SELECT DISTINCT t0\.\* .* JOIN "contact_phone" AS contactPhones ON ' .
581581
'\("relation"."id" = "contactPhones"."relation_id"\)/',
582582
$fetcher->getQuery()

0 commit comments

Comments
 (0)