From 44404a47834ea2a926d46164f2de780a761cb408 Mon Sep 17 00:00:00 2001 From: Roelof Kallenkoot Date: Fri, 23 Apr 2021 01:57:31 +0200 Subject: [PATCH 1/2] feat: laravel 8, updated dependencies --- composer.json | 14 ++++++------- phpunit.xml | 57 ++++++++++++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/composer.json b/composer.json index 6cac986..661e885 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,10 @@ } ], "require": { - "php": ">=5.6.0", - "illuminate/support": "^5.3 || ^6.0 || ^7.0", - "illuminate/routing": "^5.3 || ^6.0 || ^7.0", - "jimdo/prometheus_client_php": "^0.9.0" + "php": ">=7.2.0 || ^8.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0", + "illuminate/routing": "^6.0 || ^7.0 || ^8.0", + "promphp/prometheus_client_php": "^2.2.2" }, "autoload": { "psr-4": { @@ -22,7 +22,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1.0-dev" }, "laravel": { "providers": [ @@ -34,7 +34,7 @@ } }, "require-dev": { - "phpunit/phpunit": "^5.5", - "mockery/mockery": "^0.9.5" + "phpunit/phpunit": "^9.0", + "mockery/mockery": "^1.0" } } diff --git a/phpunit.xml b/phpunit.xml index 59500d1..6dc66ae 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,29 +1,30 @@ - - - - ./tests/ - - - - - ./src/ - - - - - - - - \ No newline at end of file + + + + ./src/ + + + + + + + + + + ./tests/ + + + + From a52828d816618ceec518e56be6bb4ebc37c17b0f Mon Sep 17 00:00:00 2001 From: Roelof Kallenkoot Date: Fri, 23 Apr 2021 02:01:39 +0200 Subject: [PATCH 2/2] fix: composer php requirement --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 661e885..b9f723b 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ } ], "require": { - "php": ">=7.2.0 || ^8.0", + "php": "^7.2.0|^8.0", "illuminate/support": "^6.0 || ^7.0 || ^8.0", "illuminate/routing": "^6.0 || ^7.0 || ^8.0", "promphp/prometheus_client_php": "^2.2.2"