Test on PHP 8.2 (#607)

* Test on PHP 8.2 * wip * Update AbstractUser.php Co-authored-by: Taylor Otwell <[email protected]>
laravel · Nov 8, 2022 · 1cd1682 · 1cd1682
1 parent 20f076b
commit 1cd1682
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,6 +2,9 @@ name: tests
 
 on:
   push:
+    branches:
+      - master
+      - '*.x'
   pull_request:
   schedule:
     - cron: '0 0 * * *'
@@ -13,7 +16,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0, 8.1]
+        php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
         laravel: [^6.0, ^7.0, ^8.0, ^9.0]
         exclude:
           - php: 7.2
@@ -28,6 +31,12 @@ jobs:
             laravel: ^6.0
           - php: 8.1
             laravel: ^7.0
+          - php: 8.2
+            laravel: ^6.0
+          - php: 8.2
+            laravel: ^7.0
+          - php: 8.2
+            laravel: ^8.0
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

diff --git a/src/AbstractUser.php b/src/AbstractUser.php
@@ -49,6 +49,13 @@ abstract class AbstractUser implements ArrayAccess, User
      */
     public $user;
 
+    /**
+     * The user's other attributes.
+     *
+     * @var array
+     */
+    public $attributes = [];
+
     /**
      * Get the unique identifier for the user.
      *
@@ -130,8 +137,12 @@ public function setRaw(array $user)
      */
     public function map(array $attributes)
     {
+        $this->attributes = $attributes;
+
         foreach ($attributes as $key => $value) {
-            $this->{$key} = $value;
+            if (property_exists($this, $key)) {
+                $this->{$key} = $value;
+            }
         }
 
         return $this;
@@ -185,4 +196,15 @@ public function offsetUnset($offset)
     {
         unset($this->user[$offset]);
     }
+
+    /**
+     * Get a user attribute value dynamically.
+     *
+     * @param  string  $key
+     * @return void
+     */
+    public function __get($key)
+    {
+        return $this->attributes[$key] ?? null;
+    }
 }