Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade PHPUnit from 9 to 10 #1044

Merged
merged 5 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Nightly-Image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
php-versions: ['7.4']
php-versions: ['8.1']
arch: ['x64', 'aarch64']

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Test-Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
php-versions: ['7.4']
php-versions: ['8.1']
database: ['mysql', 'postgres', 'sqlite']

env:
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

strategy:
matrix:
php-versions: ['7.4']
php-versions: ['8.1']
database: ['sqlite']

env:
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ php:
#- '5.6'
#- '7.0'
#- '7.1'
- '7.2'
- '7.3'
- '7.4'
# - '7.2'
# - '7.3'
# - '7.4'
- '8.0'
- '8.1'

Expand Down Expand Up @@ -44,7 +44,7 @@ after_script:

# unit test coverage reporting
after_success:
- if [ "$TRAVIS_PHP_VERSION" = "7.4" ] && [ "$DB" = "mysql" ]; then php coveralls.phar -v; fi
- if [ "$TRAVIS_PHP_VERSION" = "8.1" ] && [ "$DB" = "mysql" ]; then php coveralls.phar -v; fi

# use browserstack
addons:
Expand Down
3 changes: 3 additions & 0 deletions .travis/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<phpunit strict="false" colors="true">
<php>
<const name="CYPHT_PHPUNIT_TEST_MODE" value="phpunit"/>
</php>
<testsuite name="session">
<file>./session.php</file>
</testsuite>
Expand Down
2 changes: 1 addition & 1 deletion .travis/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ selenium_tests() {

BUILD="$DB$TRAVIS_PHP_VERSION"
case "$BUILD" in
postgresql7.4)
postgresql8.1)
#phpunit_tests && selenium_tests
phpunit_tests
;;
Expand Down
6 changes: 3 additions & 3 deletions .travis/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ setup_memcached() {

# PHP tweaks based on versions
setup_php() {
if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
sudo apt-get install php7.4-gd
if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
sudo apt-get install php8.1-gd
fi
}

Expand Down Expand Up @@ -245,7 +245,7 @@ setup_all_tests() {

BUILD="$DB$TRAVIS_PHP_VERSION"
case "$BUILD" in
postgresql7.4)
postgresql8.1)
#setup_all_tests
setup_unit_tests
;;
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Requirements
------------

Cypht requires at least PHP 7.4, with the OpenSSL and cURL extensions. You will
Cypht requires at least PHP 8.1, with the OpenSSL and cURL extensions. You will
also need PDO support if using any database features. Testing is done on
Debian and Ubuntu platforms with Nginx, Apache, standard PHP, and HHVM. We also
use Composer to manage our few PHP dependencies.
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"henrique-borba/php-sieve-manager": "^1.0",
"league/commonmark": "^2.4",
"paragonie/random_compat": "^2.0.18",
"php": ">=7.4",
"php": ">=8.1",
"symfony/dotenv": "^4.3 || 5.4",
"thomaspark/bootswatch": "^5.3",
"twbs/bootstrap": "^5.3",
Expand All @@ -58,7 +58,7 @@
"zbateson/mail-mime-parser": "^2.4"
},
"require-dev": {
"phpunit/phpunit": "^9.3.0"
"phpunit/phpunit": "^10.5"
},
"suggest": {
"ext-pdo": "To use database features, this needs to be installed",
Expand All @@ -70,7 +70,7 @@
},
"config": {
"platform": {
"php": "7.4"
"php": "8.1"
},
"optimize-autoloader": true,
"allow-plugins": {
Expand Down
Loading