Skip to content

Commit 20f59e3

Browse files
committed
Fix DbalReader data type and restore CI/Dependabot configs
- Allow array|false|null for iterator end marker (PHP 8.2+) - Restore non-empty GitHub Actions workflow and Dependabot YAML
1 parent 687669c commit 20f59e3

3 files changed

Lines changed: 74 additions & 2 deletions

File tree

.github/dependabot.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
open-pull-requests-limit: 5
8+
- package-ecosystem: composer
9+
directory: /
10+
schedule:
11+
interval: monthly
12+
open-pull-requests-limit: 5
13+
versioning-strategy: widen

.github/workflows/test.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,61 @@
1+
name: Test
12

3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
test:
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
18+
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
24+
- name: Set up PHP
25+
uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: ${{ matrix.php-versions }}
28+
coverage: none
29+
tools: composer:v2
30+
extensions: pdo_sqlite
31+
32+
- name: Validate Composer metadata
33+
run: |
34+
if [ -f composer.lock ]; then
35+
composer validate --strict --no-interaction
36+
else
37+
composer validate --strict --no-check-lock --no-interaction
38+
fi
39+
40+
- name: Get Composer cache directory
41+
id: composer-cache
42+
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
43+
44+
- name: Cache Composer packages
45+
uses: actions/cache@v4
46+
with:
47+
path: ${{ steps.composer-cache.outputs.dir }}
48+
key: ${{ runner.os }}-composer-${{ matrix.php-versions }}-${{ hashFiles('**/composer.json', '**/composer.lock') }}
49+
restore-keys: |
50+
${{ runner.os }}-composer-${{ matrix.php-versions }}-
51+
52+
- name: Install dependencies
53+
run: |
54+
if [ -f composer.lock ]; then
55+
composer install --prefer-dist --no-progress --no-interaction
56+
else
57+
composer update --prefer-dist --no-progress --no-interaction
58+
fi
59+
60+
- name: Run test suite
61+
run: vendor/bin/phpunit

src/DbalReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DbalReader implements CountableReader
1313
{
1414
private Connection $connection;
1515

16-
private ?array $data = null;
16+
private array|false|null $data = null;
1717

1818
private ?Result $result = null;
1919

0 commit comments

Comments
 (0)