Skip to content

Commit

Permalink
Merge pull request #4547 from paulbalandan/deprecated-env
Browse files Browse the repository at this point in the history
Removes deprecated settings in env file
  • Loading branch information
paulbalandan authored Apr 18, 2021
2 parents be52d2a + 9318568 commit 643eeb7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 29 deletions.
12 changes: 6 additions & 6 deletions app/Config/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class App extends BaseConfig
* Set a cookie name prefix if you need to avoid collisions.
*
* @var string
*
*
* @deprecated use Config\Cookie::$prefix property instead.
*/
public $cookiePrefix = '';
Expand All @@ -254,7 +254,7 @@ class App extends BaseConfig
* Set to `.your-domain.com` for site-wide cookies.
*
* @var string
*
*
* @deprecated use Config\Cookie::$domain property instead.
*/
public $cookieDomain = '';
Expand All @@ -267,7 +267,7 @@ class App extends BaseConfig
* Typically will be a forward slash.
*
* @var string
*
*
* @deprecated use Config\Cookie::$path property instead.
*/
public $cookiePath = '/';
Expand All @@ -280,7 +280,7 @@ class App extends BaseConfig
* Cookie will only be set if a secure HTTPS connection exists.
*
* @var boolean
*
*
* @deprecated use Config\Cookie::$secure property instead.
*/
public $cookieSecure = false;
Expand All @@ -293,7 +293,7 @@ class App extends BaseConfig
* Cookie will only be accessible via HTTP(S) (no JavaScript).
*
* @var boolean
*
*
* @deprecated use Config\Cookie::$httponly property instead.
*/
public $cookieHTTPOnly = true;
Expand All @@ -319,7 +319,7 @@ class App extends BaseConfig
* will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
*
* @var string
*
*
* @deprecated use Config\Cookie::$samesite property instead.
*/
public $cookieSameSite = 'Lax';
Expand Down
29 changes: 6 additions & 23 deletions env
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,6 @@
# app.sessionTimeToUpdate = 300
# app.sessionRegenerateDestroy = false

# app.cookiePrefix = ''
# app.cookieDomain = ''
# app.cookiePath = '/'
# app.cookieSecure = false
# app.cookieHTTPOnly = false
# app.cookieSameSite = 'Lax'
# app.cookieRaw = false
# app.cookieExpires = 0

# app.CSRFProtection = false
# app.CSRFTokenName = 'csrf_test_name'
# app.CSRFCookieName = 'csrf_cookie_name'
# app.CSRFExpire = 7200
# app.CSRFRegenerate = true
# app.CSRFExcludeURIs = []
# app.CSRFSameSite = 'Lax'

# app.CSPEnabled = false

#--------------------------------------------------------------------
Expand Down Expand Up @@ -95,14 +78,14 @@
# COOKIE
#--------------------------------------------------------------------

# cookie.prefix = ''
# cookie.expires = 0
# cookie.path = '/'
# cookie.domain = ''
# cookie.secure = false
# cookie.prefix = ''
# cookie.expires = 0
# cookie.path = '/'
# cookie.domain = ''
# cookie.secure = false
# cookie.httponly = false
# cookie.samesite = 'Lax'
# cookie.raw = false
# cookie.raw = false

#--------------------------------------------------------------------
# ENCRYPTION
Expand Down

0 comments on commit 643eeb7

Please sign in to comment.