From 2d7f5a2f25c09e17b64c8e6125d4207ce26e18e6 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 18 Sep 2019 13:48:55 -0400 Subject: [PATCH 1/3] Move to PHP 7.2, fix Jquery CVE --- composer.json | 5 ++--- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index f070d7d..5d4fd1c 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,9 @@ "psr-4": {"Sil\\PhpEnv\\": "src/"} }, "require": { - "php": ">=5.4" + "php": ">=7.0" }, "require-dev": { - "johnkary/phpunit-speedtrap": "1.*", - "phpunit/phpunit": "^6.1" + "phpunit/phpunit": "^8.0" } } diff --git a/docker-compose.yml b/docker-compose.yml index 18b1f17..d1a512b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: test: - image: silintl/php7:latest + image: silintl/php7:7.2 volumes: - ./:/data working_dir: /data From bdecfdeb06896331219d67dd24e323a49fe22086 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 18 Sep 2019 13:51:58 -0400 Subject: [PATCH 2/3] Tweak composer.json to be php 7.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5d4fd1c..651f157 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "psr-4": {"Sil\\PhpEnv\\": "src/"} }, "require": { - "php": ">=7.0" + "php": "^7.2" }, "require-dev": { "phpunit/phpunit": "^8.0" From f1f4dfc3f1a876350c3fc6563bdd5b3218df6824 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 18 Sep 2019 13:56:00 -0400 Subject: [PATCH 3/3] Fix Scrutinizer PHP version --- .scrutinizer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 5e53dd6..5f65666 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -128,7 +128,7 @@ build_failure_conditions: build: environment: - php: 7.0.6 + php: 7.2.22 dependencies: before: