build: require php ^8.5 and remove league/uri dependency
This commit is contained in:
parent
ac552a4530
commit
13091c4ec6
5 changed files with 5 additions and 50 deletions
|
|
@ -5,10 +5,10 @@
|
|||
"type": "project",
|
||||
"license": "MIT",
|
||||
"require": {
|
||||
"php": "^8.5",
|
||||
"driftingly/rector-laravel": "^2.5",
|
||||
"laravel/framework": "^13.24",
|
||||
"laravel/sanctum": "^4.0",
|
||||
"league/uri": "^7.8",
|
||||
"sentry/sentry-laravel": "^4.27",
|
||||
"webmozart/assert": "^2.4"
|
||||
},
|
||||
|
|
|
|||
6
composer.lock
generated
6
composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "ac28d88726cfaad681615cbcaf949d40",
|
||||
"content-hash": "3a952adbc7384cb3807e6f51d0759b30",
|
||||
"packages": [
|
||||
{
|
||||
"name": "brick/math",
|
||||
|
|
@ -11661,7 +11661,9 @@
|
|||
"stability-flags": {},
|
||||
"prefer-stable": true,
|
||||
"prefer-lowest": false,
|
||||
"platform": {},
|
||||
"platform": {
|
||||
"php": "^8.5"
|
||||
},
|
||||
"platform-dev": {},
|
||||
"plugin-api-version": "2.9.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ declare(strict_types=1);
|
|||
namespace Infra\Http\Helpers;
|
||||
|
||||
use Illuminate\Http\Request as HttpRequest;
|
||||
use League\Uri\Http;
|
||||
use Shared\Pagination;
|
||||
use Uri\Rfc3986\Uri;
|
||||
|
||||
|
|
@ -45,14 +44,4 @@ final class RequestHelper
|
|||
{
|
||||
return new Uri($request->fullUrl());
|
||||
}
|
||||
|
||||
public static function toLeagueUri(HttpRequest $request): Http
|
||||
{
|
||||
return Http::new($request->url());
|
||||
}
|
||||
|
||||
public static function toLeagueFullUri(HttpRequest $request): Http
|
||||
{
|
||||
return Http::new($request->fullUrl());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ use Illuminate\Support\Facades\Request;
|
|||
use Illuminate\Support\Facades\URL;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Infra\Http\Helpers\RequestHelper;
|
||||
use League\Uri\Http;
|
||||
use Shared\Pagination;
|
||||
use Uri\Rfc3986\Uri;
|
||||
|
||||
|
|
@ -66,16 +65,6 @@ class AppServiceProvider extends ServiceProvider
|
|||
/** @var \Illuminate\Http\Request $this */
|
||||
return RequestHelper::toFullUri($this);
|
||||
});
|
||||
|
||||
Request::macro('toLeagueUri', function (): Http {
|
||||
/** @var \Illuminate\Http\Request $this */
|
||||
return RequestHelper::toLeagueUri($this);
|
||||
});
|
||||
|
||||
Request::macro('toLeagueFullUri', function (): Http {
|
||||
/** @var \Illuminate\Http\Request $this */
|
||||
return RequestHelper::toLeagueFullUri($this);
|
||||
});
|
||||
}
|
||||
|
||||
protected function configureRateLimiting(): void
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ namespace Tests\Unit\Infra\Http\Helpers;
|
|||
|
||||
use Illuminate\Http\Request as HttpRequest;
|
||||
use Infra\Http\Helpers\RequestHelper;
|
||||
use League\Uri\Http;
|
||||
use Shared\Pagination;
|
||||
use Uri\Rfc3986\Uri;
|
||||
|
||||
|
|
@ -114,28 +113,4 @@ describe('RequestHelper Unit Tests', function (): void {
|
|||
expect($uri)->toBeInstanceOf(Uri::class)
|
||||
->and($uri->toString())->toBe('http://localhost/api/v1/employees?page=2&pageSize=10');
|
||||
});
|
||||
|
||||
it('converts request URL to League Uri instance', function (): void {
|
||||
// GIVEN
|
||||
$request = HttpRequest::create('http://localhost/api/v1/employees?foo=bar', 'GET');
|
||||
|
||||
// WHEN
|
||||
$uri = RequestHelper::toLeagueUri($request);
|
||||
|
||||
// THEN
|
||||
expect($uri)->toBeInstanceOf(Http::class)
|
||||
->and((string) $uri)->toBe('http://localhost/api/v1/employees');
|
||||
});
|
||||
|
||||
it('converts full request URL with query parameters to League Uri instance', function (): void {
|
||||
// GIVEN
|
||||
$request = HttpRequest::create('http://localhost/api/v1/employees?page=2&pageSize=10', 'GET');
|
||||
|
||||
// WHEN
|
||||
$uri = RequestHelper::toLeagueFullUri($request);
|
||||
|
||||
// THEN
|
||||
expect($uri)->toBeInstanceOf(Http::class)
|
||||
->and((string) $uri)->toBe('http://localhost/api/v1/employees?page=2&pageSize=10');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue