Merge pull request #8142 from kenjis/remove-Response-properties

refactor: remove deprecated properties in Response

Author: kenjis

rector.php

@@ -94,6 +94,7 @@
             __DIR__ . '/system/Router/AutoRouterImproved.php',
             // @TODO remove if deprecated $config is removed
             __DIR__ . '/system/HTTP/Request.php',
+            __DIR__ . '/system/HTTP/Response.php',
         ],
 
         // check on constant compare

system/HTTP/Response.php

@@ -146,8 +146,10 @@ class Response extends Message implements ResponseInterface
      * @param App $config
      *
      * @todo Recommend removing reliance on config injection
+     *
+     * @deprecated 4.5.0 The param $config is no longer used.
      */
-    public function __construct($config)
+    public function __construct($config) // @phpstan-ignore-line
     {
         // Default to a non-caching page.
         // Also ensures that a Cache-control header exists.
@@ -156,8 +158,6 @@ public function __construct($config)
         // We need CSP object even if not enabled to avoid calls to non existing methods
         $this->CSP = Services::csp();
 
-        $this->CSPEnabled = $config->CSPEnabled;
-
         $this->cookieStore = new CookieStore([]);
 
         $cookie = config(CookieConfig::class);

system/HTTP/ResponseTrait.php

@@ -34,23 +34,12 @@
  */
 trait ResponseTrait
 {
-    /**
-     * Whether Content Security Policy is being enforced.
-     *
-     * @var bool
-     *
-     * @deprecated Use $this->CSP->enabled() instead.
-     */
-    protected $CSPEnabled = false;
-
     /**
      * Content security policy handler
      *
      * @var ContentSecurityPolicy
-     *
-     * @deprecated Will be protected. Use `getCSP()` instead.
      */
-    public $CSP;
+    protected $CSP;
 
     /**
      * CookieStore instance.
@@ -59,69 +48,6 @@ trait ResponseTrait
      */
     protected $cookieStore;
 
-    /**
-     * Set a cookie name prefix if you need to avoid collisions
-     *
-     * @var string
-     *
-     * @deprecated Use the dedicated Cookie class instead.
-     */
-    protected $cookiePrefix = '';
-
-    /**
-     * Set to .your-domain.com for site-wide cookies
-     *
-     * @var string
-     *
-     * @deprecated Use the dedicated Cookie class instead.
-     */
-    protected $cookieDomain = '';
-
-    /**
-     * Typically will be a forward slash
-     *
-     * @var string
-     *
-     * @deprecated Use the dedicated Cookie class instead.
-     */
-    protected $cookiePath = '/';
-
-    /**
-     * Cookie will only be set if a secure HTTPS connection exists.
-     *
-     * @var bool
-     *
-     * @deprecated Use the dedicated Cookie class instead.
-     */
-    protected $cookieSecure = false;
-
-    /**
-     * Cookie will only be accessible via HTTP(S) (no javascript)
-     *
-     * @var bool
-     *
-     * @deprecated Use the dedicated Cookie class instead.
-     */
-    protected $cookieHTTPOnly = false;
-
-    /**
-     * Cookie SameSite setting
-     *
-     * @var string
-     *
-     * @deprecated Use the dedicated Cookie class instead.
-     */
-    protected $cookieSameSite = Cookie::SAMESITE_LAX;
-
-    /**
-     * Stores all cookies that were set in the response.
-     *
-     * @var array
-     *
-     * @deprecated Use the dedicated Cookie class instead.
-     */
-    protected $cookies = [];
-
     /**
      * Type of format the body is in.
      * Valid: html, json, xml

user_guide_src/source/changelogs/v4.5.0.rst

@@ -141,6 +141,22 @@ Model
 - ``Model::idValue()``
 - ``Model::classToArray()``
 
+Response
+--------
+
+- The visibility of the deprecated property ``ResponseTrait::$CSP`` has been
+  changed to protected.
+- The following deprecated properties have been removed.
+
+    - ``ResponseTrait::$CSPEnabled``
+    - ``ResponseTrait::$cookiePrefix``
+    - ``ResponseTrait::$cookieDomain``
+    - ``ResponseTrait::$cookiePath``
+    - ``ResponseTrait::$cookieSecure``
+    - ``ResponseTrait::$cookieHTTPOnly``
+    - ``ResponseTrait::$cookieSameSite``
+    - ``ResponseTrait::$cookies``
+
 CodeIgniter
 -----------
 
@@ -240,6 +256,8 @@ Deprecations
 
 - **CodeIgniter:** The ``determinePath()`` method has been deprecated. No longer
   used.
+- **Response:** The constructor parameter ``$config`` has been deprecated. No
+  longer used.
 
 Bugs Fixed
 **********