From 84318386ad62f80e732fa798ca65b0dc46ecca21 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Tue, 11 Jan 2022 01:05:21 +0300 Subject: [PATCH 1/2] Added Laravel 9 support --- composer.json | 14 +++++++------- src/Facades/AppVersion.php | 1 + src/Support/AppVersion.php | 12 +++++++----- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index a17f094..bfb4ba2 100644 --- a/composer.json +++ b/composer.json @@ -16,16 +16,16 @@ ], "require": { "php": "^7.2|^8.0", - "illuminate/container": "^6.0|^7.0|^8.0", - "illuminate/database": "^6.0|^7.0|^8.0", - "illuminate/http": "^6.0|^7.0|^8.0", - "illuminate/support": "^6.0|^7.0|^8.0", + "illuminate/container": "^6.0|^7.0|^8.0|^9.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0", + "illuminate/http": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0", "ramsey/uuid": "^3.7|^4.0", - "symfony/var-dumper": "^4.0|^5.0" + "symfony/var-dumper": "^4.0|^5.0|6.0" }, "require-dev": { - "laravel/framework": "^6.0|^7.0|^8.0", - "laravel/lumen-framework": "^6.0|^7.0|^8.0" + "laravel/framework": "^6.0|^7.0|^8.0|^9.0", + "laravel/lumen-framework": "^6.0|^7.0|^8.0|^9.0" }, "conflict": { "andrey-helldar/laravel-support": "*" diff --git a/src/Facades/AppVersion.php b/src/Facades/AppVersion.php index f08e7b0..c9346bc 100644 --- a/src/Facades/AppVersion.php +++ b/src/Facades/AppVersion.php @@ -11,6 +11,7 @@ * @method static bool is6x() * @method static bool is7x() * @method static bool is8x() + * @method static bool is9x() */ class AppVersion extends Facade { diff --git a/src/Support/AppVersion.php b/src/Support/AppVersion.php index 2818ba9..d2f6eac 100644 --- a/src/Support/AppVersion.php +++ b/src/Support/AppVersion.php @@ -25,6 +25,11 @@ public function is8x(): bool return $this->major() === 8; } + public function is9x(): bool + { + return $this->major() === 9; + } + protected function major(): int { return (int) Str::before($this->version(), '.'); @@ -33,12 +38,9 @@ protected function major(): int protected function version(): string { if (AppHelper::isLumen()) { - $version = app()->version(); - - $version = Str::after($version, '('); - $version = Str::before($version, ')'); + preg_match('/.+\((\d+\.\d+\.\d+)\)/', app()->version(), $matches); - return $version; + return $matches[1]; } return Application::VERSION; From 8952fbf6b2925b83d729c894f3e74776b67b9d8e Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 17 Jan 2022 18:25:25 +0300 Subject: [PATCH 2/2] Normalize `composer.json` --- composer.json | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index bfb4ba2..5dd0abe 100644 --- a/composer.json +++ b/composer.json @@ -1,35 +1,48 @@ { "name": "dragon-code/laravel-support", "description": "Various helper files for the Laravel and Lumen frameworks", - "type": "library", "license": "MIT", - "keywords": ["support", "laravel", "lumen", "framework", "dragon-code", "dragon", "andrey-helldar"], - "support": { - "issues": "https://github.com/TheDragonCode/laravel-support/issues", - "source": "https://github.com/TheDragonCode/laravel-support" - }, + "type": "library", + "keywords": [ + "support", + "laravel", + "lumen", + "framework", + "dragon-code", + "dragon", + "andrey-helldar" + ], "authors": [ { "name": "Andrey Helldar", "email": "helldar@ai-rus.com" } ], + "support": { + "issues": "https://github.com/TheDragonCode/laravel-support/issues", + "source": "https://github.com/TheDragonCode/laravel-support" + }, "require": { - "php": "^7.2|^8.0", - "illuminate/container": "^6.0|^7.0|^8.0|^9.0", - "illuminate/database": "^6.0|^7.0|^8.0|^9.0", - "illuminate/http": "^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0", - "ramsey/uuid": "^3.7|^4.0", - "symfony/var-dumper": "^4.0|^5.0|6.0" + "php": "^7.2 || ^8.0", + "illuminate/container": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/http": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "ramsey/uuid": "^3.7 || ^4.0", + "symfony/var-dumper": "^4.0 || ^5.0 || 6.0" }, "require-dev": { - "laravel/framework": "^6.0|^7.0|^8.0|^9.0", - "laravel/lumen-framework": "^6.0|^7.0|^8.0|^9.0" + "laravel/framework": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "laravel/lumen-framework": "^6.0 || ^7.0 || ^8.0 || ^9.0" }, "conflict": { "andrey-helldar/laravel-support": "*" }, + "suggest": { + "symfony/thanks": "Give thanks (in the form of a GitHub) to your fellow PHP package maintainers" + }, + "minimum-stability": "stable", + "prefer-stable": true, "autoload": { "psr-4": { "DragonCode\\LaravelSupport\\": "src" @@ -38,13 +51,8 @@ "helpers/dumper.php" ] }, - "suggest": { - "symfony/thanks": "Give thanks (in the form of a GitHub) to your fellow PHP package maintainers" - }, "config": { "preferred-install": "dist", "sort-packages": true - }, - "minimum-stability": "stable", - "prefer-stable": true + } }