Skip to content

Commit

Permalink
Merge branch 'laravel11_update' into 'main'
Browse files Browse the repository at this point in the history
Laravel11 update

See merge request ecphp/laravel-cas!16
  • Loading branch information
drupol committed Nov 12, 2024
2 parents bd30d21 + 2b3c840 commit 0a03ad1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ext-dom": "*",
"ext-simplexml": "*",
"ecphp/cas-lib": "^2.0",
"laravel/framework": "^10 || ^11"
"laravel/framework": "^9 || ^10 || ^11"
},
"require-dev": {
"ecphp/php-conventions": "^1.0",
Expand All @@ -25,7 +25,7 @@
"phpstan/phpstan-strict-rules": "^1.6",
"roave/security-advisories": "dev-latest",
"symfony/cache": "^6.4 || ^7.1",
"symfony/psr-http-message-bridge": "^v6.4 || ^7.1"
"symfony/psr-http-message-bridge": "^6.4 || ^7.1"
},
"suggest": {
"symfony/psr-http-message-bridge": "To bridge between Laravel and PSR HTTP Message"
Expand Down
2 changes: 2 additions & 0 deletions src/Auth/CasGuard.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
use Illuminate\Contracts\Session\Session;
use Illuminate\Http\Request;

use function sprintf;

final class CasGuard implements AuthGuard
{
private bool $loggedOut = false;
Expand Down
2 changes: 2 additions & 0 deletions src/Auth/CasUserProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public function getModel(): ?Authenticatable
return $this->model;
}

public function rehashPasswordIfRequired(Authenticatable $user, array $credentials, bool $force = false) {}

Check failure on line 36 in src/Auth/CasUserProvider.php

View workflow job for this annotation

GitHub Actions / Unit Tests (ubuntu-latest, 8.3)

Method EcPhp\LaravelCas\Auth\CasUserProvider::rehashPasswordIfRequired() has no return type specified.

Check failure on line 36 in src/Auth/CasUserProvider.php

View workflow job for this annotation

GitHub Actions / Unit Tests (ubuntu-latest, 8.1)

Method EcPhp\LaravelCas\Auth\CasUserProvider::rehashPasswordIfRequired() has no return type specified.

Check failure on line 36 in src/Auth/CasUserProvider.php

View workflow job for this annotation

GitHub Actions / Unit Tests (ubuntu-latest, 8.2)

Method EcPhp\LaravelCas\Auth\CasUserProvider::rehashPasswordIfRequired() has no return type specified.

Check failure on line 36 in src/Auth/CasUserProvider.php

View workflow job for this annotation

GitHub Actions / Unit Tests (macOS-latest, 8.2)

Method EcPhp\LaravelCas\Auth\CasUserProvider::rehashPasswordIfRequired() has no return type specified.

Check failure on line 36 in src/Auth/CasUserProvider.php

View workflow job for this annotation

GitHub Actions / Unit Tests (macOS-latest, 8.3)

Method EcPhp\LaravelCas\Auth\CasUserProvider::rehashPasswordIfRequired() has no return type specified.

Check failure on line 36 in src/Auth/CasUserProvider.php

View workflow job for this annotation

GitHub Actions / Unit Tests (macOS-latest, 8.1)

Method EcPhp\LaravelCas\Auth\CasUserProvider::rehashPasswordIfRequired() has no return type specified.

public function retrieveByCredentials(array $credentials): ?Authenticatable
{
if ([] === $credentials) {
Expand Down
2 changes: 2 additions & 0 deletions src/Auth/User/CasUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ public function getAuthPassword(): ?string
return null;
}

public function getAuthPasswordName() {}

public function getPassword(): ?string
{
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function boot()
'laravel-cas'
);
$this->app->router->group(
['namespace' => 'EcPhp\\LaravelCas\\Controllers'],
['namespace' => 'EcPhp\LaravelCas\Controllers'],
static fn () => require dirname(__DIR__) . '/Config/routes.php'
);
Auth::provider(
Expand Down

0 comments on commit 0a03ad1

Please sign in to comment.