From b8f265aec77eb84647923f6cf7b514ea8faebf96 Mon Sep 17 00:00:00 2001 From: jiajia Date: Mon, 11 Mar 2024 12:09:06 +0100 Subject: [PATCH] Applying suggestions from Bernie --- .github/ci/files/.env | 2 -- .github/ci/scripts/setup-environment.sh | 1 - .github/workflows/codeception.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- tests/_bootstrap.php | 3 +++ 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 .github/ci/files/.env diff --git a/.github/ci/files/.env b/.github/ci/files/.env deleted file mode 100644 index 1b593402..00000000 --- a/.github/ci/files/.env +++ /dev/null @@ -1,2 +0,0 @@ -APP_ENV=test -APP_DEBUG=true diff --git a/.github/ci/scripts/setup-environment.sh b/.github/ci/scripts/setup-environment.sh index a8ce2fa8..4b27fab3 100755 --- a/.github/ci/scripts/setup-environment.sh +++ b/.github/ci/scripts/setup-environment.sh @@ -5,7 +5,6 @@ set -eu mkdir -p var/config mkdir -p bin -cp .github/ci/files/.env . cp -r .github/ci/files/config/. config cp -r .github/ci/files/templates/. templates cp -r .github/ci/files/bin/console bin/console diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index da0cc4d3..b216018e 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -37,7 +37,7 @@ jobs: - { php-version: 8.0, database: "mariadb:10.3", dependencies: lowest, experimental: false, require_admin_bundle: false } - { php-version: 8.1, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, pimcore_version: "dev-followup-cli as 11.0.0", experimental: true, require_admin_bundle: true } + - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true, require_admin_bundle: true } services: redis: image: redis diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 29bddb04..f1536dbe 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -28,7 +28,7 @@ jobs: - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false } - { php-version: "8.1", dependencies: "highest", require_admin_bundle: true } - { php-version: "8.2", dependencies: "highest", require_admin_bundle: true } - - { php-version: "8.2", dependencies: "highest", pimcore_version: "dev-followup-cli as 11.0.0", phpstan_args: "", experimental: true, require_admin_bundle: true } + - { php-version: "8.2", dependencies: "highest", pimcore_version: "11.x-dev as 11.0.0", phpstan_args: "", experimental: true, require_admin_bundle: true } steps: - name: "Checkout code" uses: "actions/checkout@v2" diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php index ab8d0524..93a8f312 100644 --- a/tests/_bootstrap.php +++ b/tests/_bootstrap.php @@ -19,6 +19,9 @@ throw new \Exception('Unknown configuration! Pimcore project root not found, please set env variable PIMCORE_PROJECT_ROOT.'); } +$_ENV['APP_ENV'] = 'test'; +$_ENV['APP_DEBUG'] = true; + $pimcoreTestsSupportDir = $pimcoreTestDir . '/Support';