Skip to content

Commit

Permalink
afup#1437 update atoum + fix unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
stakovicz committed Sep 26, 2024
1 parent ed86160 commit 4d89139
Show file tree
Hide file tree
Showing 10 changed files with 1,526 additions and 5,974 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["7.0", "7.4"]
php: ["7.4", "8.2"]

steps:
- uses: actions/checkout@v4
Expand All @@ -33,8 +33,8 @@ jobs:
restore-keys: |
${{ runner.os }}-composer-
- name: Composer install
run: composer install --no-scripts
- name: Composer update/install
run: composer update --no-scripts

- name: Tests - Unit
run: ./bin/atoum
Expand Down
10 changes: 6 additions & 4 deletions bin/doctrine-dbal
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ if (PHP_VERSION_ID < 80000) {
}
}

if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
include("phpvfscomposer://" . __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal');
exit(0);
if (
(function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
|| (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
) {
return include("phpvfscomposer://" . __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal');
}
}

include __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal';
return include __DIR__ . '/..'.'/vendor/doctrine/dbal/bin/doctrine-dbal';
1 change: 0 additions & 1 deletion compose.override.yml-dist
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "2.2"
services:
db:
ports:
Expand Down
2 changes: 0 additions & 2 deletions compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "2.2"

services:
db:
build: ./docker/dockerfiles/mysql
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"algolia/algoliasearch-client-php": "^1.12",
"beberlei/assert": "^2.9",
"captioning/captioning": "^2.6",
"ccmbenchmark/ting_bundle": "^3.0",
"ccmbenchmark/ting_bundle": "3.4.1",
"cocur/slugify": "^2.3",
"doctrine/dbal": "^2.5",
"ekino/newrelic-bundle": "^1.4",
Expand All @@ -24,7 +24,7 @@
"j7mbo/twitter-api-php": "^1.0",
"jms/serializer-bundle": "^1.1",
"knpuniversity/oauth2-client-bundle": "^1.4",
"league/iso3166": "^2.1",
"league/iso3166": "^4.0",
"league/oauth2-github": "^0.2.1",
"nojimage/twitter-text-php": "1.1.*",
"pacely/mailchimp-apiv3": "^1.0",
Expand Down Expand Up @@ -90,12 +90,12 @@
],
"minimum-stability": "stable",
"require-dev": {
"atoum/atoum": "^2.8",
"atoum/atoum": "^3.0",
"atoum/stubs": "^2.5",
"friendsofphp/php-cs-fixer": "~2",
"behat/behat": "^3.7",
"behat/mink-extension": "^2.3",
"behat/mink-goutte-driver": "^1.2",
"friendsofphp/php-cs-fixer": "~2",
"smalot/pdfparser": "^0.19.0"
},
"repositories": [
Expand Down
Loading

0 comments on commit 4d89139

Please sign in to comment.