Skip to content

Commit 643eeb7

Browse files
authored
Merge pull request #4547 from paulbalandan/deprecated-env
Removes deprecated settings in env file
2 parents be52d2a + 9318568 commit 643eeb7

2 files changed

Lines changed: 12 additions & 29 deletions

File tree

app/Config/App.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ class App extends BaseConfig
241241
* Set a cookie name prefix if you need to avoid collisions.
242242
*
243243
* @var string
244-
*
244+
*
245245
* @deprecated use Config\Cookie::$prefix property instead.
246246
*/
247247
public $cookiePrefix = '';
@@ -254,7 +254,7 @@ class App extends BaseConfig
254254
* Set to `.your-domain.com` for site-wide cookies.
255255
*
256256
* @var string
257-
*
257+
*
258258
* @deprecated use Config\Cookie::$domain property instead.
259259
*/
260260
public $cookieDomain = '';
@@ -267,7 +267,7 @@ class App extends BaseConfig
267267
* Typically will be a forward slash.
268268
*
269269
* @var string
270-
*
270+
*
271271
* @deprecated use Config\Cookie::$path property instead.
272272
*/
273273
public $cookiePath = '/';
@@ -280,7 +280,7 @@ class App extends BaseConfig
280280
* Cookie will only be set if a secure HTTPS connection exists.
281281
*
282282
* @var boolean
283-
*
283+
*
284284
* @deprecated use Config\Cookie::$secure property instead.
285285
*/
286286
public $cookieSecure = false;
@@ -293,7 +293,7 @@ class App extends BaseConfig
293293
* Cookie will only be accessible via HTTP(S) (no JavaScript).
294294
*
295295
* @var boolean
296-
*
296+
*
297297
* @deprecated use Config\Cookie::$httponly property instead.
298298
*/
299299
public $cookieHTTPOnly = true;
@@ -319,7 +319,7 @@ class App extends BaseConfig
319319
* will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
320320
*
321321
* @var string
322-
*
322+
*
323323
* @deprecated use Config\Cookie::$samesite property instead.
324324
*/
325325
public $cookieSameSite = 'Lax';

env

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,6 @@
3131
# app.sessionTimeToUpdate = 300
3232
# app.sessionRegenerateDestroy = false
3333

34-
# app.cookiePrefix = ''
35-
# app.cookieDomain = ''
36-
# app.cookiePath = '/'
37-
# app.cookieSecure = false
38-
# app.cookieHTTPOnly = false
39-
# app.cookieSameSite = 'Lax'
40-
# app.cookieRaw = false
41-
# app.cookieExpires = 0
42-
43-
# app.CSRFProtection = false
44-
# app.CSRFTokenName = 'csrf_test_name'
45-
# app.CSRFCookieName = 'csrf_cookie_name'
46-
# app.CSRFExpire = 7200
47-
# app.CSRFRegenerate = true
48-
# app.CSRFExcludeURIs = []
49-
# app.CSRFSameSite = 'Lax'
50-
5134
# app.CSPEnabled = false
5235

5336
#--------------------------------------------------------------------
@@ -95,14 +78,14 @@
9578
# COOKIE
9679
#--------------------------------------------------------------------
9780

98-
# cookie.prefix = ''
99-
# cookie.expires = 0
100-
# cookie.path = '/'
101-
# cookie.domain = ''
102-
# cookie.secure = false
81+
# cookie.prefix = ''
82+
# cookie.expires = 0
83+
# cookie.path = '/'
84+
# cookie.domain = ''
85+
# cookie.secure = false
10386
# cookie.httponly = false
10487
# cookie.samesite = 'Lax'
105-
# cookie.raw = false
88+
# cookie.raw = false
10689

10790
#--------------------------------------------------------------------
10891
# ENCRYPTION

0 commit comments

Comments
 (0)