afup#1437 update atoum + fix unit test

stakovicz · Sep 14, 2024 · 4d69c42 · 4d69c42
1 parent b66c412
commit 4d69c42
Show file tree

Hide file tree

Showing 9 changed files with 1,523 additions and 711 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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

diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal
@@ -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';
diff --git a/compose.override.yml-dist b/compose.override.yml-dist
@@ -1,4 +1,3 @@
-version: "2.2"
 services:
   db:
     ports:

diff --git a/compose.yml b/compose.yml
@@ -1,5 +1,3 @@
-version: "2.2"
-
 services:
   db:
     build: ./docker/dockerfiles/mysql

diff --git a/composer.json b/composer.json
@@ -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",
@@ -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": [