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

Adjust for latest = 8.0 php version #828

Merged
merged 3 commits into from
Jan 19, 2021
Merged

Adjust for latest = 8.0 php version #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c6b678
Adjust for latest = 8.0 php version
mvorisek Jan 19, 2021
92f5518
fix PHP 8.0 stan
mvorisek Jan 19, 2021
48df1de
fix typo
mvorisek Jan 19, 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
17 changes: 6 additions & 11 deletions .github/workflows/unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['7.3', 'latest', '8.0']
php: ['7.3', '7.4', 'latest']
type: ['Phpunit']
include:
- php: 'latest'
Expand Down Expand Up @@ -158,19 +158,14 @@ jobs:
if: startsWith(matrix.type, 'Phpunit')
run: "vendor/bin/phpunit --configuration phpunit-pgsql.xml.dist \"$(if [ -n \"$LOG_COVERAGE\" ]; then echo '--coverage-text'; else echo '--no-coverage'; fi)\" -v"

- name: "Run tests: MSSQL (for PHP < 8.0) (only for Phpunit)"
if: startsWith(matrix.type, 'Phpunit') && matrix.php != '8.0'
# reenable once https://github.com/doctrine/dbal/pull/4284 is merged
continue-on-error: true
run: "vendor/bin/phpunit --configuration phpunit-mssql.xml.dist \"$(if [ -n \"$LOG_COVERAGE\" ]; then echo '--coverage-text'; else echo '--no-coverage'; fi)\" -v"

- name: "Run tests: MSSQL (for PHP = 8.0, allowed to fail) (only for Phpunit)"
if: startsWith(matrix.type, 'Phpunit') && matrix.php == '8.0'
- name: "Run tests: MSSQL (only for Phpunit)"
if: startsWith(matrix.type, 'Phpunit')
# remove "continue-on-error: true" once https://github.com/doctrine/dbal/pull/4284 is merged
continue-on-error: true
run: "vendor/bin/phpunit --configuration phpunit-mssql.xml.dist \"$(if [ -n \"$LOG_COVERAGE\" ]; then echo '--coverage-text'; else echo '--no-coverage'; fi)\" -v"

- name: "Run tests: Oracle (for PHP < 8.0) (only for Phpunit)"
if: startsWith(matrix.type, 'Phpunit') && matrix.php != '8.0'
- name: "Run tests: Oracle (only for Phpunit)"
if: startsWith(matrix.type, 'Phpunit')
run: "vendor/bin/phpunit --configuration phpunit-oracle.xml.dist \"$(if [ -n \"$LOG_COVERAGE\" ]; then echo '--coverage-text'; else echo '--no-coverage'; fi)\" -v"

- name: Upload coverage logs 1/2 (only for "latest" Phpunit)
Expand Down
2 changes: 1 addition & 1 deletion src/Persistence/Csv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public function closeFile(): void
public function getLine(): ?array
{
$data = fgetcsv($this->handle, 0, $this->delimiter, $this->enclosure, $this->escape_char);
if ($data === false || $data === null) {
if ($data === false) {
return null;
}

Expand Down