Skip to content

Commit 1db132d

Browse files
Merge pull request #122 from he4rt/refactor/extension-modernization-wave-1
refactor: extension modernization wave 1 (test consolidation + macro purge + correctness fixes)
2 parents daa2d0f + 870c4e4 commit 1db132d

68 files changed

Lines changed: 5971 additions & 2048 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,17 @@ jobs:
120120
- name: Cache Composer dependencies
121121
uses: actions/cache@v4
122122
with:
123-
path: tests/vendor
124-
key: composer-${{ matrix.php }}-${{ hashFiles('tests/composer.lock') }}
123+
path: vendor
124+
key: composer-${{ matrix.php }}-${{ hashFiles('composer.json', 'composer.lock') }}
125125
restore-keys: composer-${{ matrix.php }}-
126126

127127
- name: Install Composer dependencies
128-
working-directory: tests
129128
run: |
130129
php -d extension=cassandra "$(command -v composer)" \
131130
install --no-ansi --no-interaction --no-progress --prefer-dist
132131
133132
- name: Run tests
134-
working-directory: tests
135133
run: |
136-
php -d extension=cassandra ./vendor/bin/pest \
137-
--colors=always \
138-
--fail-on-risky \
139-
--fail-on-warning \
140-
--fail-on-deprecation
134+
php -d extension=cassandra ./vendor/bin/pest --colors=always
141135
env:
142136
SCYLLADB_HOSTS: "127.0.0.1"

Pest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* Helper functions (env, scyllaDbConnection, migrateKeyspace, dropKeyspace)
7+
* live in tests/Support/helpers.php and are loaded eagerly via composer's
8+
* autoload-dev.files so they are available before Pest's bootstrap.
9+
*
10+
* This file is reserved for Pest-specific registration: uses() / expect()
11+
* extensions / shared dataset definitions.
12+
*/
13+
14+
uses()->group('unit')->in('tests/Unit');
15+
uses()->group('feature')->in('tests/Feature');

composer.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,30 @@
1212
"license": "Apache-2.0",
1313
"description": "ScyllaDB/Cassandra PHP driver",
1414
"require": {
15-
"php": ">= 8.1",
15+
"php": "^8.2|^8.3|^8.4|^8.5",
1616
"ext-date": "*"
1717
},
18+
"require-dev": {
19+
"pestphp/pest": "^3.8",
20+
"nesbot/carbon": "^3.5",
21+
"symfony/process": "^7.0"
22+
},
23+
"config": {
24+
"platform": {
25+
"php": "8.3.0"
26+
},
27+
"allow-plugins": {
28+
"pestphp/pest-plugin": true
29+
}
30+
},
31+
"autoload-dev": {
32+
"psr-4": {
33+
"Cassandra\\Tests\\": "./tests"
34+
},
35+
"files": [
36+
"tests/Support/helpers.php"
37+
]
38+
},
1839
"php-ext": {
1940
"extension-name": "cassandra",
2041
"configure-options": [

0 commit comments

Comments
 (0)