Revert "[11.x] use promoted properties (#53807)" (#53832)

This reverts commit 69b19ce.
laravel · Dec 10, 2024 · da5e4e4 · da5e4e4
1 parent 69b19ce
commit da5e4e4
Show file tree

Hide file tree

Showing 50 changed files with 702 additions and 175 deletions.
diff --git a/src/Illuminate/Auth/Access/Events/GateEvaluated.php b/src/Illuminate/Auth/Access/Events/GateEvaluated.php
@@ -4,6 +4,34 @@
 
 class GateEvaluated
 {
+    /**
+     * The authenticatable model.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable|null
+     */
+    public $user;
+
+    /**
+     * The ability being evaluated.
+     *
+     * @var string
+     */
+    public $ability;
+
+    /**
+     * The result of the evaluation.
+     *
+     * @var bool|null
+     */
+    public $result;
+
+    /**
+     * The arguments given during evaluation.
+     *
+     * @var array
+     */
+    public $arguments;
+
     /**
      * Create a new event instance.
      *
@@ -13,11 +41,11 @@ class GateEvaluated
      * @param  array  $arguments
      * @return void
      */
-    public function __construct(
-        public $user,
-        public $ability,
-        public $result,
-        public $arguments,
-    ) {
+    public function __construct($user, $ability, $result, $arguments)
+    {
+        $this->user = $user;
+        $this->ability = $ability;
+        $this->result = $result;
+        $this->arguments = $arguments;
     }
 }
diff --git a/src/Illuminate/Auth/DatabaseUserProvider.php b/src/Illuminate/Auth/DatabaseUserProvider.php
@@ -11,6 +11,27 @@
 
 class DatabaseUserProvider implements UserProvider
 {
+    /**
+     * The active database connection.
+     *
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
+    /**
+     * The hasher implementation.
+     *
+     * @var \Illuminate\Contracts\Hashing\Hasher
+     */
+    protected $hasher;
+
+    /**
+     * The table containing the users.
+     *
+     * @var string
+     */
+    protected $table;
+
     /**
      * Create a new database user provider.
      *
@@ -19,11 +40,11 @@ class DatabaseUserProvider implements UserProvider
      * @param  string  $table
      * @return void
      */
-    public function __construct(
-        protected ConnectionInterface $connection,
-        protected HasherContract $hasher,
-        protected $table,
-    ) {
+    public function __construct(ConnectionInterface $connection, HasherContract $hasher, $table)
+    {
+        $this->connection = $connection;
+        $this->table = $table;
+        $this->hasher = $hasher;
     }
 
     /**

diff --git a/src/Illuminate/Auth/EloquentUserProvider.php b/src/Illuminate/Auth/EloquentUserProvider.php
@@ -10,6 +10,20 @@
 
 class EloquentUserProvider implements UserProvider
 {
+    /**
+     * The hasher implementation.
+     *
+     * @var \Illuminate\Contracts\Hashing\Hasher
+     */
+    protected $hasher;
+
+    /**
+     * The Eloquent user model.
+     *
+     * @var string
+     */
+    protected $model;
+
     /**
      * The callback that may modify the user retrieval queries.
      *
@@ -24,10 +38,10 @@ class EloquentUserProvider implements UserProvider
      * @param  string  $model
      * @return void
      */
-    public function __construct(
-        protected HasherContract $hasher,
-        protected $model,
-    ) {
+    public function __construct(HasherContract $hasher, $model)
+    {
+        $this->model = $model;
+        $this->hasher = $hasher;
     }
 
     /**

diff --git a/src/Illuminate/Auth/Events/Attempting.php b/src/Illuminate/Auth/Events/Attempting.php
@@ -4,6 +4,27 @@
 
 class Attempting
 {
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
+    /**
+     * The credentials for the user.
+     *
+     * @var array
+     */
+    public $credentials;
+
+    /**
+     * Indicates if the user should be "remembered".
+     *
+     * @var bool
+     */
+    public $remember;
+
     /**
      * Create a new event instance.
      *
@@ -12,10 +33,10 @@ class Attempting
      * @param  bool  $remember
      * @return void
      */
-    public function __construct(
-        public $guard,
-        #[\SensitiveParameter] public $credentials,
-        public $remember,
-    ) {
+    public function __construct($guard, #[\SensitiveParameter] $credentials, $remember)
+    {
+        $this->guard = $guard;
+        $this->remember = $remember;
+        $this->credentials = $credentials;
     }
 }
diff --git a/src/Illuminate/Auth/Events/Authenticated.php b/src/Illuminate/Auth/Events/Authenticated.php
@@ -8,16 +8,30 @@ class Authenticated
 {
     use SerializesModels;
 
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
+    /**
+     * The authenticated user.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable
+     */
+    public $user;
+
     /**
      * Create a new event instance.
      *
      * @param  string  $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */
-    public function __construct(
-        public $guard,
-        public $user,
-    ) {
+    public function __construct($guard, $user)
+    {
+        $this->user = $user;
+        $this->guard = $guard;
     }
 }
diff --git a/src/Illuminate/Auth/Events/CurrentDeviceLogout.php b/src/Illuminate/Auth/Events/CurrentDeviceLogout.php
@@ -8,16 +8,30 @@ class CurrentDeviceLogout
 {
     use SerializesModels;
 
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
+    /**
+     * The authenticated user.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable
+     */
+    public $user;
+
     /**
      * Create a new event instance.
      *
      * @param  string  $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */
-    public function __construct(
-        public $guard,
-        public $user,
-    ) {
+    public function __construct($guard, $user)
+    {
+        $this->user = $user;
+        $this->guard = $guard;
     }
 }
diff --git a/src/Illuminate/Auth/Events/Failed.php b/src/Illuminate/Auth/Events/Failed.php
@@ -4,6 +4,27 @@
 
 class Failed
 {
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
+    /**
+     * The user the attempter was trying to authenticate as.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable|null
+     */
+    public $user;
+
+    /**
+     * The credentials provided by the attempter.
+     *
+     * @var array
+     */
+    public $credentials;
+
     /**
      * Create a new event instance.
      *
@@ -12,10 +33,10 @@ class Failed
      * @param  array  $credentials
      * @return void
      */
-    public function __construct(
-        public $guard,
-        public $user,
-        #[\SensitiveParameter] public $credentials,
-    ) {
+    public function __construct($guard, $user, #[\SensitiveParameter] $credentials)
+    {
+        $this->user = $user;
+        $this->guard = $guard;
+        $this->credentials = $credentials;
     }
 }
diff --git a/src/Illuminate/Auth/Events/Login.php b/src/Illuminate/Auth/Events/Login.php
@@ -8,6 +8,27 @@ class Login
 {
     use SerializesModels;
 
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
+    /**
+     * The authenticated user.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable
+     */
+    public $user;
+
+    /**
+     * Indicates if the user should be "remembered".
+     *
+     * @var bool
+     */
+    public $remember;
+
     /**
      * Create a new event instance.
      *
@@ -16,10 +37,10 @@ class Login
      * @param  bool  $remember
      * @return void
      */
-    public function __construct(
-        public $guard,
-        public $user,
-        public $remember,
-    ) {
+    public function __construct($guard, $user, $remember)
+    {
+        $this->user = $user;
+        $this->guard = $guard;
+        $this->remember = $remember;
     }
 }
diff --git a/src/Illuminate/Auth/Events/Logout.php b/src/Illuminate/Auth/Events/Logout.php
@@ -8,16 +8,30 @@ class Logout
 {
     use SerializesModels;
 
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
+    /**
+     * The authenticated user.
+     *
+     * @var \Illuminate\Contracts\Auth\Authenticatable
+     */
+    public $user;
+
     /**
      * Create a new event instance.
      *
      * @param  string  $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */
-    public function __construct(
-        public $guard,
-        public $user,
-    ) {
+    public function __construct($guard, $user)
+    {
+        $this->user = $user;
+        $this->guard = $guard;
     }
 }