[14.x] Use constructor promotion and typed properties in middleware classes

Author: sumaiazaman

src/Illuminate/Auth/Middleware/RequirePassword.php

@@ -9,38 +9,19 @@
 
 class RequirePassword
 {
-    /**
-     * The response factory instance.
-     *
-     * @var \Illuminate\Contracts\Routing\ResponseFactory
-     */
-    protected $responseFactory;
-
-    /**
-     * The URL generator instance.
-     *
-     * @var \Illuminate\Contracts\Routing\UrlGenerator
-     */
-    protected $urlGenerator;
-
     /**
      * The password timeout.
-     *
-     * @var int
      */
-    protected $passwordTimeout;
+    protected int $passwordTimeout;
 
     /**
      * Create a new middleware instance.
-     *
-     * @param  \Illuminate\Contracts\Routing\ResponseFactory  $responseFactory
-     * @param  \Illuminate\Contracts\Routing\UrlGenerator  $urlGenerator
-     * @param  int|null  $passwordTimeout
      */
-    public function __construct(ResponseFactory $responseFactory, UrlGenerator $urlGenerator, $passwordTimeout = null)
-    {
-        $this->responseFactory = $responseFactory;
-        $this->urlGenerator = $urlGenerator;
+    public function __construct(
+        protected ResponseFactory $responseFactory,
+        protected UrlGenerator $urlGenerator,
+        ?int $passwordTimeout = null,
+    ) {
         $this->passwordTimeout = $passwordTimeout ?: 10800;
     }
 

src/Illuminate/Cookie/Middleware/EncryptCookies.php

@@ -13,13 +13,6 @@
 
 class EncryptCookies
 {
-    /**
-     * The encrypter instance.
-     *
-     * @var \Illuminate\Contracts\Encryption\Encrypter
-     */
-    protected $encrypter;
-
     /**
      * The names of the cookies that should not be encrypted.
      *
@@ -43,12 +36,10 @@ class EncryptCookies
 
     /**
      * Create a new CookieGuard instance.
-     *
-     * @param  \Illuminate\Contracts\Encryption\Encrypter  $encrypter
      */
-    public function __construct(EncrypterContract $encrypter)
-    {
-        $this->encrypter = $encrypter;
+    public function __construct(
+        protected EncrypterContract $encrypter,
+    ) {
     }
 
     /**

src/Illuminate/Foundation/Http/Middleware/PreventRequestForgery.php

@@ -21,20 +21,6 @@ class PreventRequestForgery
     use ExcludesPaths,
         InteractsWithTime;
 
-    /**
-     * The application instance.
-     *
-     * @var \Illuminate\Contracts\Foundation\Application
-     */
-    protected $app;
-
-    /**
-     * The encrypter implementation.
-     *
-     * @var \Illuminate\Contracts\Encryption\Encrypter
-     */
-    protected $encrypter;
-
     /**
      * The URIs that should be excluded.
      *
@@ -72,14 +58,11 @@ class PreventRequestForgery
 
     /**
      * Create a new middleware instance.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     * @param  \Illuminate\Contracts\Encryption\Encrypter  $encrypter
      */
-    public function __construct(Application $app, Encrypter $encrypter)
-    {
-        $this->app = $app;
-        $this->encrypter = $encrypter;
+    public function __construct(
+        protected Application $app,
+        protected Encrypter $encrypter,
+    ) {
     }
 
     /**

src/Illuminate/Http/Middleware/TrustHosts.php

@@ -7,13 +7,6 @@
 
 class TrustHosts
 {
-    /**
-     * The application instance.
-     *
-     * @var \Illuminate\Contracts\Foundation\Application
-     */
-    protected $app;
-
     /**
      * The trusted hosts that have been configured to always be trusted.
      *
@@ -30,12 +23,10 @@ class TrustHosts
 
     /**
      * Create a new middleware instance.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
      */
-    public function __construct(Application $app)
-    {
-        $this->app = $app;
+    public function __construct(
+        protected Application $app,
+    ) {
     }
 
     /**

src/Illuminate/Session/Middleware/StartSession.php

@@ -14,30 +14,13 @@
 
 class StartSession
 {
-    /**
-     * The session manager.
-     *
-     * @var \Illuminate\Session\SessionManager
-     */
-    protected $manager;
-
-    /**
-     * The callback that can resolve an instance of the cache factory.
-     *
-     * @var callable|null
-     */
-    protected $cacheFactoryResolver;
-
     /**
      * Create a new session middleware.
-     *
-     * @param  \Illuminate\Session\SessionManager  $manager
-     * @param  callable|null  $cacheFactoryResolver
      */
-    public function __construct(SessionManager $manager, ?callable $cacheFactoryResolver = null)
-    {
-        $this->manager = $manager;
-        $this->cacheFactoryResolver = $cacheFactoryResolver;
+    public function __construct(
+        protected SessionManager $manager,
+        protected ?callable $cacheFactoryResolver = null,
+    ) {
     }
 
     /**

src/Illuminate/View/Middleware/ShareErrorsFromSession.php

@@ -8,21 +8,12 @@
 
 class ShareErrorsFromSession
 {
-    /**
-     * The view factory implementation.
-     *
-     * @var \Illuminate\Contracts\View\Factory
-     */
-    protected $view;
-
     /**
      * Create a new error binder instance.
-     *
-     * @param  \Illuminate\Contracts\View\Factory  $view
      */
-    public function __construct(ViewFactory $view)
-    {
-        $this->view = $view;
+    public function __construct(
+        protected ViewFactory $view,
+    ) {
     }
 
     /**