diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml index 1e254ffe..30889516 100644 --- a/.github/workflows/build-mariadb.yml +++ b/.github/workflows/build-mariadb.yml @@ -19,7 +19,7 @@ jobs: with: php-version: ${{ matrix.php-versions }} tools: composer:v2 - extensions: mbstring, xml, ctype, pdo_mysql, mysql, curl, json, zip, session, filter, posix, openssl, fileinfo, bcmath, gmp, gnupg + extensions: mbstring, xml, ctype, pdo_mysql, mysql, curl, json, zip, session, filter, posix, openssl, fileinfo, bcmath, gmp - name: Install tools run: sudo apt-get install -y ant diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml index 43927969..44032827 100644 --- a/.github/workflows/build-mysql.yml +++ b/.github/workflows/build-mysql.yml @@ -19,7 +19,7 @@ jobs: with: php-version: ${{ matrix.php-versions }} tools: composer:v2 - extensions: mbstring, xml, ctype, pdo_mysql, mysql, curl, json, zip, session, filter, posix, openssl, fileinfo, bcmath, gmp, gnupg + extensions: mbstring, xml, ctype, pdo_mysql, mysql, curl, json, zip, session, filter, posix, openssl, fileinfo, bcmath, gmp - name: Install tools run: sudo apt-get install -y ant diff --git a/lib/Froxlor/Api/Response.php b/lib/Froxlor/Api/Response.php index 920a4c79..370a07a1 100644 --- a/lib/Froxlor/Api/Response.php +++ b/lib/Froxlor/Api/Response.php @@ -34,7 +34,9 @@ class Response public static function jsonResponse($data = null, int $response_code = 200) { - http_response_code($response_code); + if (!defined('TRAVIS_CI') || TRAVIS_CI == 0) { + http_response_code($response_code); + } return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT); } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 4843c47c..7466c051 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -8,7 +8,7 @@ if (file_exists('/etc/froxlor-test.pwd') && file_exists('/etc/froxlor-test.rpwd' $rpwd = trim(file_get_contents('/etc/froxlor-test.rpwd')); define('TRAVIS_CI', 0); } else { - // travis-ci.org + // github actions $pwd = 'fr0xl0r.TravisCI'; $rpwd = 'fr0xl0r.TravisCI'; define('TRAVIS_CI', 1);