From 7278c43267a46320b11c35011aa500c12c726228 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 14 Oct 2020 15:31:53 +1300 Subject: [PATCH 1/2] MNT Expand Composer requirements to support PHP 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 746624526..7de89bc81 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "symfony/config": "^3.2 || ^4", "symfony/translation": "^2.8 || ^3 || ^4", "symfony/yaml": "^3.2 || ^4", - "php": ">=7.1.0", + "php": "^7.1 || ^8", "ext-ctype": "*", "ext-dom": "*", "ext-hash": "*", From 758e60c22f0e07109f5c0eff06acaed568d985ab Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Fri, 16 Oct 2020 12:03:07 +1300 Subject: [PATCH 2/2] MNT Update Behat config to support Symfony 4 --- behat.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/behat.yml b/behat.yml index 77f4c17aa..d8238ec0b 100644 --- a/behat.yml +++ b/behat.yml @@ -9,7 +9,7 @@ default: suites: framework: paths: - - %paths.modules.admin%/tests/behat/features + - '%paths.modules.admin%/tests/behat/features' contexts: - SilverStripe\Framework\Tests\Behaviour\FeatureContext - SilverStripe\Framework\Tests\Behaviour\CmsFormsContext @@ -19,7 +19,7 @@ default: - SilverStripe\BehatExtension\Context\LoginContext - SilverStripe\BehatExtension\Context\FixtureContext: - - %paths.modules.admin%/tests/behat/features/files/ + - '%paths.modules.admin%/tests/behat/features/files/' extensions: SilverStripe\BehatExtension\MinkExtension: @@ -30,5 +30,5 @@ default: wd_host: "http://127.0.0.1:9515" #chromedriver port SilverStripe\BehatExtension\Extension: - screenshot_path: %paths.base%/artifacts/screenshots - bootstrap_file: "tests/behat/serve-bootstrap.php" \ No newline at end of file + screenshot_path: '%paths.base%/artifacts/screenshots' + bootstrap_file: "tests/behat/serve-bootstrap.php"