Skip to content

Commit edd88b1

Browse files
committed
Release v4.0.3
1 parent d35ee91 commit edd88b1

File tree

218 files changed

+1219
-3713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+1219
-3713
lines changed

LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ This repository holds the distributable version of the framework,
99
including the user guide. It has been built from the
1010
[development repository](https://github.com/codeigniter4/CodeIgniter4).
1111

12-
**This is pre-release code and should not be used in production sites.**
13-
1412
More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
1513

1614
The user guide corresponding to this version of the framework can be found

app/Config/Kint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php namespace Config;
22

3-
use Kint\Renderer\Renderer;
43
use CodeIgniter\Config\BaseConfig;
4+
use Kint\Renderer\Renderer;
55

66
class Kint extends BaseConfig
77
{

app/Config/Logger.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ class Logger extends BaseConfig
3434
*/
3535
public $threshold = 3;
3636

37-
/*
38-
|--------------------------------------------------------------------------
39-
| Error Logging Directory Path
40-
|--------------------------------------------------------------------------
41-
| By default, logs are written to WRITEPATH . 'logs/'
42-
| Specify a different destination here, if desired.
43-
*/
44-
public $path = '';
45-
4637
/*
4738
|--------------------------------------------------------------------------
4839
| Date Format for Logs
@@ -116,6 +107,14 @@ class Logger extends BaseConfig
116107
* integer notation (i.e. 0700, 0644, etc.)
117108
*/
118109
'filePermissions' => 0644,
110+
111+
/*
112+
* Logging Directory Path
113+
*
114+
* By default, logs are written to WRITEPATH . 'logs/'
115+
* Specify a different destination here, if desired.
116+
*/
117+
'path' => '',
119118
],
120119

121120
/**

app/Config/Mimes.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,11 +516,7 @@ public static function guessExtensionFromType(string $type, ?string $proposed_ex
516516

517517
foreach (static::$mimes as $ext => $types)
518518
{
519-
if (is_string($types) && $types === $type)
520-
{
521-
return $ext;
522-
}
523-
else if (is_array($types) && in_array($type, $types))
519+
if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types)))
524520
{
525521
return $ext;
526522
}

app/Config/Routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php namespace Config;
22

33
// Create a new instance of our RouteCollection class.
4-
$routes = Services::routes(true);
4+
$routes = Services::routes();
55

66
// Load the system's routing file first, so that the app and ENVIRONMENT
77
// can override as needed.

app/Config/Services.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php namespace Config;
22

33
use CodeIgniter\Config\Services as CoreServices;
4-
use CodeIgniter\Config\BaseConfig;
54

65
require_once SYSTEMPATH . 'Config/Services.php';
76

app/Views/errors/html/error_exception.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
133133
{
134134
continue;
135-
} ?>
135+
} ?>
136136

137137
<h3>$<?= $var ?></h3>
138138

@@ -235,7 +235,7 @@
235235
<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
236236
{
237237
continue;
238-
} ?>
238+
} ?>
239239

240240
<?php $empty = false; ?>
241241

@@ -287,15 +287,15 @@
287287
</tr>
288288
</thead>
289289
<tbody>
290-
<?php foreach ($headers as $name => $value) : ?>
290+
<?php foreach ($headers as $value) : ?>
291291
<?php if (empty($value))
292292
{
293293
continue;
294-
} ?>
294+
} ?>
295295
<?php if (! is_array($value))
296296
{
297297
$value = [$value];
298-
} ?>
298+
} ?>
299299
<?php foreach ($value as $h) : ?>
300300
<tr>
301301
<td><?= esc($h->getName(), 'html') ?></td>

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"ext-curl": "*",
1010
"ext-intl": "*",
1111
"ext-json": "*",
12+
"ext-mbstring": "*",
1213
"kint-php/kint": "^3.3",
1314
"psr/log": "^1.1",
1415
"laminas/laminas-escaper": "^2.6"

contributing.md

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)