Skip to content

Upgrade to Laravel 13.7 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thekevinm wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Upgrade to Laravel 13.7 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,20 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"dreamfactory/df-core": "~1.0",
"dreamfactory/df-system": "~0.6",
"spatie/laravel-http-logger": "^1.1",
"promphp/prometheus_client_php": "2.2.*",
"predis/predis": "1.1.*",
"php": "^8.3",
"ext-json": "*",
"php": "^8.0"
"laravel/helpers": "^1.8",
"dreamfactory/df-core": "~1.0.4",
"spatie/laravel-http-logger": "^1.11.2",
"promphp/prometheus_client_php": "^2.14",
"predis/predis": "^1.1"
},
"require-dev": {
"phpunit/phpunit": "~7.0",
"laravel/framework": "^13.7",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.6",
"phpunit/phpunit": "^11.5.3",
"orchestra/testbench": "^11.0",
"filp/whoops": "~2.0"
},
"autoload": {
Expand Down
6 changes: 4 additions & 2 deletions src/ServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ public function register()
* @return void
*/
protected function addMiddleware()
{
{
Route::aliasMiddleware(ServiceProvider::MIDDLEWARE_NAME, HttpLogger::class);
Route::pushMiddlewareToGroup('df.api', ServiceProvider::MIDDLEWARE_NAME);
if (Route::hasMiddlewareGroup('df.api')) {
Route::pushMiddlewareToGroup('df.api', ServiceProvider::MIDDLEWARE_NAME);
}
}

protected function addMetricRoute() {
Expand Down
12 changes: 12 additions & 0 deletions src/Utility/HttpLogger/PredisAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,18 @@ public function collect(): array
);
}

/**
* Summary metrics are not used by this exporter, but the Adapter interface
* (promphp/prometheus_client_php >= 2.3) requires this method. Implement as
* a no-op so the adapter satisfies the contract.
*
* @param array $data
*/
public function updateSummary(array $data): void
{
// No-op: summary metrics are not collected by df-exporter-prometheus.
}

/**
* @param array $data
*/
Expand Down