From 0d6f69e405cc4c907f5f7944d9b4c0c2bb5a20f6 Mon Sep 17 00:00:00 2001 From: Luiz Machado Date: Sat, 7 Sep 2019 06:24:12 -0300 Subject: [PATCH 1/6] fix return annotation (#490) --- src/Native/Facades/Sentinel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Native/Facades/Sentinel.php b/src/Native/Facades/Sentinel.php index cdf17b73..de1f93cc 100644 --- a/src/Native/Facades/Sentinel.php +++ b/src/Native/Facades/Sentinel.php @@ -67,7 +67,8 @@ public function getSentinel() * Creates a new Native Bootstraper instance. * * @param \Cartalyst\Sentinel\Native\SentinelBootstrapper $bootstrapper - * @return void + * + * @return \Cartalyst\Sentinel\Native\SentinelBootstrapper */ public static function instance(SentinelBootstrapper $bootstrapper = null) { From 7b647e2c54358678004afe2f3729a55e0482b50d Mon Sep 17 00:00:00 2001 From: edwinds02 Date: Thu, 9 Jan 2025 15:50:30 +0800 Subject: [PATCH 2/6] support laravel 10 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8a5ed108..f48a37b2 100644 --- a/composer.json +++ b/composer.json @@ -19,9 +19,9 @@ } ], "require": { - "php": ">=5.4.0", + "php": "^8.0", "cartalyst/support": "~1.0||~2.0", - "illuminate/support": "~5.0" + "illuminate/support": "^10.0" }, "require-dev": { "illuminate/cookie": "~5.0", From c4993241adbe5758665bf4457d32a05d4bb98bd2 Mon Sep 17 00:00:00 2001 From: edwinds02 Date: Thu, 9 Jan 2025 15:58:42 +0800 Subject: [PATCH 3/6] add cartalyst support --- composer.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f48a37b2..9f98c89a 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": "^8.0", - "cartalyst/support": "~1.0||~2.0", + "cartalyst/support": "dev-master", "illuminate/support": "^10.0" }, "require-dev": { @@ -61,5 +61,11 @@ } } }, - "minimum-stability": "stable" + "minimum-stability": "stable", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/edwinds02/support" + } + ] } From dcb0c253259c88dbc6877e7f1f9beb3fb34737f4 Mon Sep 17 00:00:00 2001 From: edwinds02 Date: Thu, 9 Jan 2025 16:17:05 +0800 Subject: [PATCH 4/6] change version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9f98c89a..9877c57e 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": "^8.0", - "cartalyst/support": "dev-master", + "cartalyst/support": "dev-2.0", "illuminate/support": "^10.0" }, "require-dev": { From 77e3b84e2c61af3e353c4fe7b155055301af1d9a Mon Sep 17 00:00:00 2001 From: edwinds02 Date: Thu, 9 Jan 2025 16:17:59 +0800 Subject: [PATCH 5/6] dev 2 --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 6f4a9df8..8943d8c3 100644 --- a/composer.json +++ b/composer.json @@ -53,9 +53,6 @@ }, "extra": { "component": "package", - "branch-alias": { - "dev-master": "6.0.x-dev" - }, "laravel": { "providers": [ "Cartalyst\\Sentinel\\Laravel\\SentinelServiceProvider" From 48881ae33b7e302f11fff0e6145c5c651eb813b4 Mon Sep 17 00:00:00 2001 From: edwinds02 Date: Thu, 9 Jan 2025 16:20:09 +0800 Subject: [PATCH 6/6] update --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8943d8c3..1ed74621 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.0", - "cartalyst/support": "dev-2.0", + "cartalyst/support": "2.0.x-dev", "illuminate/support": "^10.0" }, "require-dev": {