Skip to content

Commit ef3a8be

Browse files
committed
Patch framework (v4.4.0 => v4.4.1)
Conflicts: Config/ForeignCharacters.php app/Config/Autoload.php app/Config/Modules.php
1 parent 9b9333a commit ef3a8be

File tree

6 files changed

+30
-3
lines changed

6 files changed

+30
-3
lines changed

app/Config/Autoload.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
* can find the files as needed.
1414
*
1515
* NOTE: If you use an identical key in $psr4 or $classmap, then
16-
* the values in this file will overwrite the framework's values.
16+
* the values in this file will overwrite the framework's values.
17+
*
18+
* NOTE: This class is required prior to Autoloader instantiation,
19+
* and does not extend BaseConfig.
20+
*
21+
* @immutable
1722
*/
1823
class Autoload extends AutoloadConfig
1924
{

app/Config/DocTypes.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace Config;
44

5+
/**
6+
* @immutable
7+
*/
58
class DocTypes
69
{
710
/**

app/Config/Email.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ class Email extends BaseConfig
5656
public bool $SMTPKeepAlive = false;
5757

5858
/**
59-
* SMTP Encryption. Either tls or ssl
59+
* SMTP Encryption.
60+
*
61+
* @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
62+
* to the server. 'ssl' means implicit SSL. Connection on port
63+
* 465 should set this to ''.
6064
*/
6165
public string $SMTPCrypto = 'tls';
6266

app/Config/ForeignCharacters.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
namespace Config;
44

5-
class ForeignCharacters extends \CodeIgniter\Config\ForeignCharacters
5+
use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
6+
7+
/**
8+
* @immutable
9+
*/
10+
class ForeignCharacters extends BaseForeignCharacters
611
{
712
}

app/Config/Mimes.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*
1616
* When working with mime types, please make sure you have the ´fileinfo´
1717
* extension enabled to reliably detect the media types.
18+
*
19+
* @immutable
1820
*/
1921
class Mimes
2022
{

app/Config/Modules.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
use CodeIgniter\Modules\Modules as BaseModules;
66

7+
/**
8+
* Modules Configuration.
9+
*
10+
* NOTE: This class is required prior to Autoloader instantiation,
11+
* and does not extend BaseConfig.
12+
*
13+
* @immutable
14+
*/
715
class Modules extends BaseModules
816
{
917
/**

0 commit comments

Comments
 (0)