Skip to content

Commit 653cad7

Browse files
Codeigniter 4.7.2 to Codeigniter 4.7.4 updated
1 parent 4ad04ec commit 653cad7

5 files changed

Lines changed: 32 additions & 19 deletions

File tree

app/Config/Database.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class Database extends Config
140140
// * @var array<string, mixed>
141141
// */
142142
// public array $default = [
143-
// 'DSN' => 'localhost:1521/XEPDB1',
143+
// 'DSN' => 'localhost:1521/FREEPDB1',
144144
// 'username' => 'root',
145145
// 'password' => 'root',
146146
// 'DBDriver' => 'OCI8',
@@ -177,7 +177,7 @@ class Database extends Config
177177
'swapPre' => '',
178178
'encrypt' => false,
179179
'compress' => false,
180-
'strictOn' => false,
180+
'strictOn' => true,
181181
'failover' => [],
182182
'port' => 3306,
183183
'foreignKeys' => true,

app/Config/Events.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@
2525

2626
Events::on('pre_system', static function (): void {
2727
if (ENVIRONMENT !== 'testing') {
28-
if (ini_get('zlib.output_compression')) {
28+
$value = ini_get('zlib.output_compression');
29+
30+
if (filter_var($value, FILTER_VALIDATE_BOOLEAN) || (int) $value > 0) {
2931
throw FrameworkException::forEnabledZlibOutputCompression();
3032
}
3133

3234
while (ob_get_level() > 0) {
3335
ob_end_flush();
3436
}
3537

36-
ob_start(static fn($buffer) => $buffer);
38+
ob_start(static fn ($buffer) => $buffer);
3739
}
3840

3941
/*

app/Config/View.php

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
use CodeIgniter\Config\View as BaseView;
66
use CodeIgniter\View\ViewDecoratorInterface;
77

8-
/**
9-
* @phpstan-type parser_callable (callable(mixed): mixed)
10-
* @phpstan-type parser_callable_string (callable(mixed): mixed)&string
11-
*/
128
class View extends BaseView
139
{
1410
/**
@@ -34,8 +30,7 @@ class View extends BaseView
3430
* { title|esc(js) }
3531
* { created_on|date(Y-m-d)|esc(attr) }
3632
*
37-
* @var array<string, string>
38-
* @phpstan-var array<string, parser_callable_string>
33+
* @var array<string, (callable(mixed): mixed)&string>
3934
*/
4035
public $filters = [];
4136

@@ -44,8 +39,7 @@ class View extends BaseView
4439
* by the core Parser by creating aliases that will be replaced with
4540
* any callable. Can be single or tag pair.
4641
*
47-
* @var array<string, callable|list<string>|string>
48-
* @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
42+
* @var array<string, (callable(mixed...): mixed)|((callable(mixed...): mixed)&string)|list<(callable(mixed...): mixed)&string>>
4943
*/
5044
public $plugins = [];
5145

@@ -59,4 +53,21 @@ class View extends BaseView
5953
* @var list<class-string<ViewDecoratorInterface>>
6054
*/
6155
public array $decorators = [];
56+
57+
/**
58+
* Subdirectory within app/Views for namespaced view overrides.
59+
*
60+
* Namespaced views will be searched in:
61+
*
62+
* app/Views/{$appOverridesFolder}/{Namespace}/{view_path}.{php|html...}
63+
*
64+
* This allows application-level overrides for package or module views
65+
* without modifying vendor source files.
66+
*
67+
* Examples:
68+
* 'overrides' -> app/Views/overrides/Example/Blog/post/card.php
69+
* 'vendor' -> app/Views/vendor/Example/Blog/post/card.php
70+
* '' -> app/Views/Example/Blog/post/card.php (direct mapping)
71+
*/
72+
public string $appOverridesFolder = 'overrides';
6273
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"bertugfahriozer/sql2migration": "^1.0",
1818
"ci4-cms-erp/ext_module_generator": "^1.1",
1919
"claviska/simpleimage": "4.4.0",
20-
"codeigniter4/framework": "4.7.2",
20+
"codeigniter4/framework": "4.7.4",
2121
"codeigniter4/settings": "2.2",
2222
"codeigniter4/shield": "1.3.0",
2323
"codeigniter4/translations": "4.7.2",

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)