From d6ec61c8bc9b00e3725e05ae74cc223f05981438 Mon Sep 17 00:00:00 2001 From: Jarryd Tilbrook Date: Mon, 11 Feb 2019 21:56:48 +0800 Subject: [PATCH 1/8] Enable package discovery for laravel 5.5+ (#5) --- composer.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/composer.json b/composer.json index e45a96f..68453e1 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,14 @@ "extra": { "branch-alias": { "dev-master": "1.0-dev" + }, + "laravel": { + "providers": [ + "Superbalist\\LaravelPrometheusExporter\\PrometheusServiceProvider" + ], + "aliases": { + "Prometheus": "Superbalist\\LaravelPrometheusExporter\\PrometheusFacade" + } } }, "require-dev": { From 4174a30cd50889fba28f1791d503a990dd7b4c18 Mon Sep 17 00:00:00 2001 From: Nic Appleby Date: Mon, 11 Feb 2019 15:57:56 +0200 Subject: [PATCH 2/8] Update changelog for release --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index 3f605af..c80ceda 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.3 - 2019-02-11 + +* Enable package discovery for laravel 5.5+ + ## 1.0.2 - 2019-01-16 * Add compatability with Laravel Lumen (make named route configurable) From c8ef2037dc41c7ee322d26a488ae7938c9454c04 Mon Sep 17 00:00:00 2001 From: Luca Critelli Date: Thu, 17 Oct 2019 03:45:01 -0400 Subject: [PATCH 3/8] Update composer to work with Laravel 5 and Laravel 6 (#10) Update composer to work with Laravel 5 and Laravel 6 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 68453e1..12a861d 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.3", - "illuminate/routing": "^5.3", + "illuminate/support": "^5.3 || ^6.0", + "illuminate/routing": "^5.3 || ^6.0", "jimdo/prometheus_client_php": "^0.9.0" }, "autoload": { From c1cd48549fb5270120d4c529e6dad739383843fc Mon Sep 17 00:00:00 2001 From: Nic Appleby Date: Thu, 17 Oct 2019 09:46:09 +0200 Subject: [PATCH 4/8] Update changelog for release --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index c80ceda..c728e12 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.4 - 2019-10-17 + +* Enable Laravel 6.0 compatability + ## 1.0.3 - 2019-02-11 * Enable package discovery for laravel 5.5+ From 39442da599b92f1200125598687380753a679815 Mon Sep 17 00:00:00 2001 From: janwehner Date: Mon, 16 Mar 2020 10:01:29 +0100 Subject: [PATCH 5/8] update call to array_get helper to use the Illuminate\Support\Arr class (#13) Co-authored-by: Jan Wehner --- src/PrometheusServiceProvider.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PrometheusServiceProvider.php b/src/PrometheusServiceProvider.php index 018f997..4b189f5 100644 --- a/src/PrometheusServiceProvider.php +++ b/src/PrometheusServiceProvider.php @@ -2,6 +2,7 @@ namespace Superbalist\LaravelPrometheusExporter; +use Illuminate\Support\Arr; use Illuminate\Support\ServiceProvider; use Prometheus\CollectorRegistry; use Prometheus\Storage\Adapter; @@ -50,7 +51,7 @@ public function register() $factory = $app['prometheus.storage_adapter_factory']; /** @var StorageAdapterFactory $factory */ $driver = config('prometheus.storage_adapter'); $configs = config('prometheus.storage_adapters'); - $config = array_get($configs, $driver, []); + $config = Arr::get($configs, $driver, []); return $factory->make($driver, $config); }); $this->app->alias(Adapter::class, 'prometheus.storage_adapter'); From 885f959ce902986bbd993237d94c23ce237b642b Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Mon, 16 Mar 2020 10:01:52 +0100 Subject: [PATCH 6/8] Make Laravel 7.0 compatible (#14) --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 12a861d..6cac986 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.3 || ^6.0", - "illuminate/routing": "^5.3 || ^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" }, "autoload": { From 6e874128e893dec4e1f4e93c688b190c164df6de Mon Sep 17 00:00:00 2001 From: Nic Appleby Date: Mon, 16 Mar 2020 11:02:49 +0200 Subject: [PATCH 7/8] Update changelog for release --- changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changelog.md b/changelog.md index c728e12..c600f9a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 1.0.5 - 2020-03-16 + +* Update call to array_get helper to use the Illuminate\Support\Arr class +* Enable Laravel 7 compatability + ## 1.0.4 - 2019-10-17 * Enable Laravel 6.0 compatability From f4d1481c190f1ae07c184d8002f43d2406b33c17 Mon Sep 17 00:00:00 2001 From: Alexander Smaga Date: Mon, 26 Oct 2020 11:55:00 +0200 Subject: [PATCH 8/8] Adding support for laravel 8 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6cac986..aba64e1 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ ], "require": { "php": ">=5.6.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", "jimdo/prometheus_client_php": "^0.9.0" }, "autoload": {