[4.x] Supports PHP 8.4 (#542)

* [4.x] Supports PHP 8.4 * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> --------- Signed-off-by: Mior Muhammad Zaki <[email protected]>
laravel · Nov 21, 2024 · e4d2d10 · e4d2d10
1 parent 6fa9c8e
commit e4d2d10
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
         laravel: [11]
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
@@ -36,9 +36,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-           composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
-           composer update --prefer-dist --no-interaction --no-progress
+           composer update --prefer-dist --no-interaction --no-progress --with="illuminate/contracts=^${{ matrix.laravel }}"
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit --display-deprecations --fail-on-deprecation
 
diff --git a/src/Contracts/HasApiTokens.php b/src/Contracts/HasApiTokens.php
@@ -29,7 +29,7 @@ public function tokenCan(string $ability);
      * @param  \DateTimeInterface|null  $expiresAt
      * @return \Laravel\Sanctum\NewAccessToken
      */
-    public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null);
+    public function createToken(string $name, array $abilities = ['*'], ?DateTimeInterface $expiresAt = null);
 
     /**
      * Get the access token currently associated with the user.

diff --git a/src/Guard.php b/src/Guard.php
@@ -128,7 +128,7 @@ protected function getTokenFromRequest(Request $request)
      * @param  string|null  $token
      * @return bool
      */
-    protected function isValidBearerToken(string $token = null)
+    protected function isValidBearerToken(?string $token = null)
     {
         if (! is_null($token) && str_contains($token, '|')) {
             $model = new Sanctum::$personalAccessTokenModel;

diff --git a/src/HasApiTokens.php b/src/HasApiTokens.php
@@ -46,7 +46,7 @@ public function tokenCan(string $ability)
      * @param  \DateTimeInterface|null  $expiresAt
      * @return \Laravel\Sanctum\NewAccessToken
      */
-    public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null)
+    public function createToken(string $name, array $abilities = ['*'], ?DateTimeInterface $expiresAt = null)
     {
         $plainTextToken = $this->generateTokenString();