Upgrade to PHPUnit 8.5

Fixes #32810
mantisbt · Aug 18, 2023 · 0e1fce2 · 0e1fce2
2 parents 555f52a + 9224acb
commit 0e1fce2
Show file tree

Hide file tree

Showing 29 changed files with 635 additions and 1,378 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,10 @@ api/rest/swagger
 /vendor/
 composer.phar
 
+# PHPUnit
+.phpunit.result.cache
+
+
 # Settings below are for convenience when switching branches on Dev machines
 
 # v1.2.x config files

diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,13 @@ install:
 before_script:
   # Ignore E_DEPRECATED notices when running PHP 8.1 builds
   - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '8.1', '>=' ) );"; then echo 'error_reporting = E_ALL & ~E_DEPRECATED' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/mantis_php81.ini; fi
+
+  # sendmail replacement
+  - chmod +x "$TRAVIS_BUILD_DIR/tests/fakesendmail.sh"
+  - echo 'sendmail_path = $TRAVIS_BUILD_DIR/tests/fakesendmail.sh' > ./tests/sendmail.ini
+  - phpenv config-add ./tests/sendmail.ini
+
+  # MantisBT setup
   - ./build/travis_before_script.sh
 
 script:

diff --git a/build/travis_script.sh b/build/travis_script.sh
@@ -27,7 +27,7 @@ function build_docbook() {
 if [[ -z $DOCBOOK ]]
 then
 	echo "Executing MantisBT test scripts..."
-	vendor/bin/phpunit --bootstrap ./tests/bootstrap.php ./tests/AllTests.php
+	vendor/bin/phpunit
 else
 	echo "Building DocBook..."
 	build_docbook

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "ext-mbstring": "*",
         "ext-json": "*",
         "slim/slim": "^3.0",
-        "guzzlehttp/guzzle": "^6.2",
+        "guzzlehttp/guzzle": "^7.5",
         "vboctor/disposable_email_checker": "^3.0",
         "adodb/adodb-php": "^5.20.21",
         "phpmailer/phpmailer": "~6.0",
@@ -17,30 +17,13 @@
     },
     "require-dev": {
         "ext-zip": "*",
-        "phpunit/phpunit": "dev-mantis-6.5",
-        "phpunit/php-code-coverage": "@dev",
-        "phpunit/php-file-iterator": "@dev"
+        "phpunit/phpunit": "^8.5"
     },
     "repositories": [
         {
             "type": "vcs",
             "url": "https://github.com/mantisbt/securimage",
             "no-api": true
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/mantisbt/phpunit",
-            "no-api": true
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/mantisbt/php-code-coverage",
-            "no-api": true
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/mantisbt/php-file-iterator",
-            "no-api": true
         }
     ],
     "license": "GPL-2.0-or-later",