Skip to content

Commit b837548

Browse files
committed
Release 4.0.1
1 parent e933be6 commit b837548

File tree

3 files changed

+64
-24
lines changed

3 files changed

+64
-24
lines changed

composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "codeigniter4/framework",
2+
"name": "codeigniter4/codeigniter4",
33
"type": "project",
44
"description": "The CodeIgniter framework v4",
55
"homepage": "https://codeigniter.com",
@@ -8,14 +8,15 @@
88
"php": ">=7.2",
99
"ext-curl": "*",
1010
"ext-intl": "*",
11+
"ext-json": "*",
1112
"kint-php/kint": "^3.3",
1213
"psr/log": "^1.1",
13-
"zendframework/zend-escaper": "^2.5"
14+
"laminas/laminas-escaper": "^2.6"
1415
},
1516
"require-dev": {
1617
"codeigniter4/codeigniter4-standard": "^1.0",
1718
"mikey179/vfsstream": "1.6.*",
18-
"phpunit/phpunit": "^7.0",
19+
"phpunit/phpunit": "^8.5",
1920
"squizlabs/php_codesniffer": "^3.3"
2021
},
2122
"autoload": {
@@ -26,7 +27,8 @@
2627
"scripts": {
2728
"post-update-cmd": [
2829
"@composer dump-autoload",
29-
"CodeIgniter\\ComposerScripts::postUpdate"
30+
"CodeIgniter\\ComposerScripts::postUpdate",
31+
"bash admin/setup.sh"
3032
]
3133
},
3234
"support": {

phpunit.xml.dist

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,60 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="tests/_support/_bootstrap.php"
3-
backupGlobals="false"
4-
colors="true"
5-
convertErrorsToExceptions="true"
6-
convertNoticesToExceptions="true"
7-
convertWarningsToExceptions="true"
8-
stopOnError="false"
9-
stopOnFailure="false"
10-
stopOnIncomplete="false"
11-
stopOnSkipped="false">
12-
<testsuites>
13-
<testsuite name="app">
14-
<directory>./tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
18-
<php>
19-
<env name="app.baseURL" value="http://example.com"/>
20-
</php>
2+
<phpunit bootstrap="system/Test/bootstrap.php"
3+
backupGlobals="false"
4+
colors="true"
5+
convertErrorsToExceptions="true"
6+
convertNoticesToExceptions="true"
7+
convertWarningsToExceptions="true"
8+
stopOnError="false"
9+
stopOnFailure="false"
10+
stopOnIncomplete="false"
11+
stopOnSkipped="false">
12+
<testsuites>
13+
<testsuite name="app">
14+
<directory>./tests</directory>
15+
</testsuite>
16+
</testsuites>
2117

18+
<filter>
19+
<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
20+
<directory suffix=".php">./app</directory>
21+
<exclude>
22+
<directory suffix=".php">./app/Views</directory>
23+
<file>./app/Config/Routes.php</file>
24+
</exclude>
25+
</whitelist>
26+
</filter>
27+
28+
<logging>
29+
<log type="coverage-html" target="build/logs/html"/>
30+
<log type="coverage-clover" target="build/logs/clover.xml"/>
31+
<log type="coverage-php" target="build/logs/coverage.serialized"/>
32+
<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
33+
<log type="testdox-html" target="build/logs/testdox.html"/>
34+
<log type="testdox-text" target="build/logs/testdox.txt"/>
35+
<log type="junit" target="build/logs/logfile.xml"/>
36+
</logging>
37+
38+
<php>
39+
<server name="app.baseURL" value="http://example.com"/>
40+
41+
<!-- Directory containing phpunit.xml -->
42+
<const name="HOMEPATH" value="./"/>
43+
44+
<!-- Directory containing the Paths config file -->
45+
<const name="CONFIGPATH" value="./app/Config/"/>
46+
47+
<!-- Directory containing the front controller (index.php) -->
48+
<const name="PUBLICPATH" value="./public/"/>
49+
50+
<!-- Database configuration -->
51+
<!-- <env name="database.tests.hostname" value="localhost"/> -->
52+
<!-- <env name="database.tests.database" value="tests"/> -->
53+
<!-- <env name="database.tests.username" value="tests_user"/> -->
54+
<!-- <env name="database.tests.password" value=""/> -->
55+
<!-- <env name="database.tests.DBDriver" value="MySQLi"/> -->
56+
<!-- <env name="database.tests.DBPrefix" value="tests_"/> -->
57+
<env name="database.tests.database" value=":memory:"/>
58+
<env name="database.tests.DBDriver" value="SQLite3"/>
59+
</php>
2260
</phpunit>

system/CodeIgniter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class CodeIgniter
6666
/**
6767
* The current version of CodeIgniter Framework
6868
*/
69-
const CI_VERSION = '4.0.0';
69+
const CI_VERSION = '4.0.1';
7070

7171
/**
7272
* App startup time.

0 commit comments

Comments
 (0)