From 0969a17dfde7f565fea7aef0c5c4c31fcb455f0a Mon Sep 17 00:00:00 2001 From: Matt Rink Date: Mon, 17 Aug 2020 10:15:07 +0100 Subject: [PATCH 1/6] Updated the composer.json to require PHP 7.2, removed Travis CI tests for all PHP versions prior to 7.2 and replace jimdo/prometheus_client_php with endclothing/prometheus_client_php to support PHP 7.2. --- .travis.yml | 4 +--- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92fb328..2d0de07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,9 @@ language: php php: - - 5.6 - - 7.0 - - 7.1 - 7.2 - 7.3 + - 7.4 before_install: - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini diff --git a/composer.json b/composer.json index 6cac986..528f508 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,10 @@ } ], "require": { - "php": ">=5.6.0", + "php": ">=7.2.0", "illuminate/support": "^5.3 || ^6.0 || ^7.0", "illuminate/routing": "^5.3 || ^6.0 || ^7.0", - "jimdo/prometheus_client_php": "^0.9.0" + "endclothing/prometheus_client_php": "^1.0" }, "autoload": { "psr-4": { From 382f292364385a784e854cb4dffbb6d93276de74 Mon Sep 17 00:00:00 2001 From: Matt Rink Date: Mon, 17 Aug 2020 10:28:57 +0100 Subject: [PATCH 2/6] Updated PHPUnit to v8 and Mockery to v1.4 in order to support PHP 7.4. --- composer.json | 4 ++-- phpunit.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 528f508..74aac1b 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ } }, "require-dev": { - "phpunit/phpunit": "^5.5", - "mockery/mockery": "^0.9.5" + "phpunit/phpunit": "^8", + "mockery/mockery": "^1.4" } } diff --git a/phpunit.xml b/phpunit.xml index 59500d1..460aa40 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -8,7 +8,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" verbose="true" > From ab2dfee49ecb451f2d626820875a595c10b51688 Mon Sep 17 00:00:00 2001 From: Matt Rink Date: Mon, 17 Aug 2020 10:35:24 +0100 Subject: [PATCH 3/6] Downgraded Mockery from 1.4 to 1.3 in order to support PHP versions < 7.3. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 74aac1b..a43ee12 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,6 @@ }, "require-dev": { "phpunit/phpunit": "^8", - "mockery/mockery": "^1.4" + "mockery/mockery": "^1.3" } } From 4e1e6e0940a6551c14b2583b87daa7480fe8efe4 Mon Sep 17 00:00:00 2001 From: FutureMatt <43476243+FutureMatt@users.noreply.github.com> Date: Fri, 11 Sep 2020 15:48:24 +0100 Subject: [PATCH 4/6] PHP 7.2+ Support * Updated the composer.json to require PHP 7.2, removed Travis CI tests for all PHP versions prior to 7.2 and replace jimdo/prometheus_client_php with endclothing/prometheus_client_php to support PHP 7.2. * Updated PHPUnit to v8 and Mockery to v1.4 in order to support PHP 7.4. * Downgraded Mockery from 1.4 to 1.3 in order to support PHP versions < 7.3. --- .travis.yml | 4 +--- composer.json | 8 ++++---- phpunit.xml | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92fb328..2d0de07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,9 @@ language: php php: - - 5.6 - - 7.0 - - 7.1 - 7.2 - 7.3 + - 7.4 before_install: - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini diff --git a/composer.json b/composer.json index 6cac986..a43ee12 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,10 @@ } ], "require": { - "php": ">=5.6.0", + "php": ">=7.2.0", "illuminate/support": "^5.3 || ^6.0 || ^7.0", "illuminate/routing": "^5.3 || ^6.0 || ^7.0", - "jimdo/prometheus_client_php": "^0.9.0" + "endclothing/prometheus_client_php": "^1.0" }, "autoload": { "psr-4": { @@ -34,7 +34,7 @@ } }, "require-dev": { - "phpunit/phpunit": "^5.5", - "mockery/mockery": "^0.9.5" + "phpunit/phpunit": "^8", + "mockery/mockery": "^1.3" } } diff --git a/phpunit.xml b/phpunit.xml index 59500d1..460aa40 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -8,7 +8,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" verbose="true" > From d83727e74bbc9338d4ef5329106a0b6e4d497d76 Mon Sep 17 00:00:00 2001 From: FutureMatt <43476243+FutureMatt@users.noreply.github.com> Date: Tue, 15 Sep 2020 23:11:38 +0100 Subject: [PATCH 5/6] Update composer.json Updated composer.json to alter the package name to match the Git repo. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a43ee12..a431a3d 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "superbalist/laravel-prometheus-exporter", + "name": "futurematt/laravel-prometheus-exporter", "description": "A prometheus exporter for Laravel", "license": "MIT", "authors": [ From 4011434af5e5236e2bdb888b76d3b3f87170f12a Mon Sep 17 00:00:00 2001 From: ohnotnow Date: Tue, 15 Sep 2020 23:14:32 +0100 Subject: [PATCH 6/6] Add laravel 8 support (#3) * PHP 7.2+ Support * Updated the composer.json to require PHP 7.2, removed Travis CI tests for all PHP versions prior to 7.2 and replace jimdo/prometheus_client_php with endclothing/prometheus_client_php to support PHP 7.2. * Updated PHPUnit to v8 and Mockery to v1.4 in order to support PHP 7.4. * Downgraded Mockery from 1.4 to 1.3 in order to support PHP versions < 7.3. * Updated composer.json to allow laravel ^8.0 Co-authored-by: FutureMatt <43476243+FutureMatt@users.noreply.github.com> --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a43ee12..b329bb0 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ ], "require": { "php": ">=7.2.0", - "illuminate/support": "^5.3 || ^6.0 || ^7.0", - "illuminate/routing": "^5.3 || ^6.0 || ^7.0", + "illuminate/support": "^5.3 || ^6.0 || ^7.0 || ^8.0", + "illuminate/routing": "^5.3 || ^6.0 || ^7.0 || ^8.0", "endclothing/prometheus_client_php": "^1.0" }, "autoload": {