diff --git a/test/defaults b/test/defaults index 1f5f6379..f5e9fab3 100644 --- a/test/defaults +++ b/test/defaults @@ -6,7 +6,7 @@ declare -gA default_composer declare -gA latest_composer # Defaults for scalingo-22: -default_php["scalingo-22"]="8.1." # This one depends on the semver stable rule configuration +default_php["scalingo-22"]="8.4." # This one depends on the semver stable rule configuration default_nginx["scalingo-22"]="1.28." default_composer["scalingo-22"]="2.9." latest_composer["scalingo-22"]="2.9.5" diff --git a/test/fixtures/php-8.1/composer/composer.json b/test/fixtures/php-8.1/composer/composer.json deleted file mode 100644 index 4df1fcf0..00000000 --- a/test/fixtures/php-8.1/composer/composer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "require": { - "php": "~8.1" - } -} diff --git a/test/fixtures/php-8.1/composer/composer.lock b/test/fixtures/php-8.1/composer/composer.lock deleted file mode 100644 index 0ae1a5de..00000000 --- a/test/fixtures/php-8.1/composer/composer.lock +++ /dev/null @@ -1,20 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "d9dfec2d0b542f1d8822ddb04789dc0f", - "packages": [], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": "~8.1" - }, - "platform-dev": [], - "plugin-api-version": "2.2.0" -} diff --git a/test/fixtures/php-8.1/optional_builtin/composer.json b/test/fixtures/php-8.1/optional_builtin/composer.json deleted file mode 100644 index 38a1ebb8..00000000 --- a/test/fixtures/php-8.1/optional_builtin/composer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "require": { - "php": "~8.1", - "ext-calendar": "*", - "ext-ftp": "*", - "ext-gettext": "*", - "ext-gmp": "*", - "ext-imap": "*", - "ext-sodium": "*", - "ext-tidy": "*" - } -} diff --git a/test/fixtures/php-8.1/optional_builtin/composer.lock b/test/fixtures/php-8.1/optional_builtin/composer.lock deleted file mode 100644 index 963c9619..00000000 --- a/test/fixtures/php-8.1/optional_builtin/composer.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "6e2f9726d381e20c588c75dc55226220", - "packages": [], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": "~8.1", - "ext-calendar": "*", - "ext-ftp": "*", - "ext-gettext": "*", - "ext-gmp": "*", - "ext-imap": "*", - "ext-sodium": "*", - "ext-tidy": "*" - }, - "platform-dev": [], - "plugin-api-version": "2.6.0" -} diff --git a/test/php81 b/test/php81 deleted file mode 100644 index fda692c1..00000000 --- a/test/php81 +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env bash - -readonly default_builtins_extensions_81=( - "bcmath" "bz2" "Core" "ctype" "curl" "date" "dom" "exif" "fileinfo" - "filter" "gd" "hash" "iconv" "intl" "json" "libxml" "mbstring" "mysqli" - "mysqlnd" "openssl" "pcntl" "pcre" "PDO" "pdo_mysql" "pdo_pgsql" - "pdo_sqlite" "pgsql" "Phar" "posix" "readline" "Reflection" "session" - "shmop" "SimpleXML" "soap" "sockets" "SPL" "sqlite3" "standard" "tokenizer" - "xml" "xmlreader" "xmlwriter" "xsl" "Zend OPcache" "zip" "zlib" -) - -readonly default_pecl_extensions_81=( - "apcu" "mongodb" "redis" -) - -readonly optional_builtin_extensions_81=( - "calendar" "ftp" "gettext" "gmp" "imap" "sodium" "tidy" -) - -test::php81::classic() { -# -# Test a deployment of a classic app (not using Composer) -# Specifying we want PHP 8.1.x via environment -# - - PHP_VERSION="8.1" - export PHP_VERSION - - test::utils::setupFixture "defaults/classic" - test::helpers::classic_deploy \ - "8.1." \ - "${default_nginx["${STACK}"]}" -} - -test::php81::composer() { -# -# Test a deployment of a PHP app using Composer -# Specifying we want PHP 8.1.x via composer.json -# - - test::utils::setupFixture "php-8.1/composer" - test::helpers::composer_deploy \ - "8.1." \ - "${default_nginx["${STACK}"]}" \ - "${default_composer["${STACK}"]}" -} - -test::php81::extensions::default() { -# -# Test the presence of default enabled built-in extensions. -# - - test::utils::setupFixture "php-8.1/composer" - - test::utils::compile - test::helpers::enter_prod - - local extensions=("${default_builtin_extensions_81[@]}") - extensions+=("${default_pecl_extensions_81[@]}") - - test::helpers::enabled_extensions "${extensions[@]}" -} - -test::php81::extensions::optional_builtin() { -# -# Test the presence of available built-in extensions that are not -# enabled by default. -# - - test::utils::setupFixture "php-8.1/optional_builtin" - - test::utils::compile - test::helpers::enter_prod - - test::helpers::enabled_extensions "${optional_builtin_extensions_81[@]}" -} diff --git a/test/tests b/test/tests index 02da4d63..14c6f3ae 100755 --- a/test/tests +++ b/test/tests @@ -4,7 +4,6 @@ source "$( pwd )/test/utils" source "$( pwd )/test/helpers" source "$( pwd )/test/defaults" -source "$( pwd )/test/php81" source "$( pwd )/test/php82" source "$( pwd )/test/php83" source "$( pwd )/test/php84" @@ -19,12 +18,6 @@ source "$( pwd )/test/nginx" suite_addTest test::defaults::classic suite_addTest test::defaults::composer -# PHP 8.1 -suite_addTest test::php81::classic -suite_addTest test::php81::composer -suite_addTest test::php81::extensions::default -suite_addTest test::php81::extensions::optional_builtin - # PHP 8.2 suite_addTest test::php82::classic suite_addTest test::php82::composer