Skip to content

Commit b7c3227

Browse files
actions-useractions-user
committedFeb 1, 2021
Release v4.1.0
1 parent 4a82d66 commit b7c3227

File tree

5 files changed

+39
-42
lines changed

5 files changed

+39
-42
lines changed
 

‎.github/workflows/phpunit.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
php-versions: ['7.2', '7.3', '7.4']
14+
php-versions: ['7.3', '7.4']
1515

1616
runs-on: ubuntu-latest
1717

@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v2
2323

2424
- name: Setup PHP, with composer and extensions
25-
uses: shivammathur/setup-php@master
25+
uses: shivammathur/setup-php@v2
2626
with:
2727
php-version: ${{ matrix.php-versions }}
2828
tools: composer, pecl, phpunit
@@ -34,14 +34,14 @@ jobs:
3434
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3535

3636
- name: Cache composer dependencies
37-
uses: actions/cache@v1
37+
uses: actions/cache@v2
3838
with:
3939
path: ${{ steps.composer-cache.outputs.dir }}
40-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
40+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
4141
restore-keys: ${{ runner.os }}-composer-
4242

4343
- name: Install dependencies
44-
run: composer install --no-progress --no-suggest --no-interaction --prefer-dist --optimize-autoloader
44+
run: composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
4545
# To prevent rate limiting you may need to supply an OAuth token in Settings > Secrets
4646
# env:
4747
# https://getcomposer.org/doc/articles/troubleshooting.md#api-rate-limit-and-oauth-tokens

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Problems with it can be raised on our forum, or as issues in the main repository
5050

5151
## Server Requirements
5252

53-
PHP version 7.2 or higher is required, with the following extensions installed:
53+
PHP version 7.3 or higher is required, with the following extensions installed:
5454

5555
- [intl](http://php.net/manual/en/intl.requirements.php)
5656
- [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"homepage": "https://codeigniter.com",
66
"license": "MIT",
77
"require": {
8-
"php": "^7.2 || ^8.0",
8+
"php": "^7.3||^8.0",
99
"codeigniter4/framework": "^4"
1010
},
1111
"require-dev": {
1212
"fakerphp/faker": "^1.9",
1313
"mikey179/vfsstream": "^1.6",
14-
"phpunit/phpunit": "^8.5"
14+
"phpunit/phpunit": "^9.1"
1515
},
1616
"suggest": {
1717
"ext-fileinfo": "Improves mime type detection for files"

‎phpunit.xml.dist

+30-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php"
34
backupGlobals="false"
45
colors="true"
56
convertErrorsToExceptions="true"
@@ -8,53 +9,49 @@
89
stopOnError="false"
910
stopOnFailure="false"
1011
stopOnIncomplete="false"
11-
stopOnSkipped="false">
12+
stopOnSkipped="false"
13+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
14+
<coverage includeUncoveredFiles="true" processUncoveredFiles="true">
15+
<include>
16+
<directory suffix=".php">./app</directory>
17+
</include>
18+
<exclude>
19+
<directory suffix=".php">./app/Views</directory>
20+
<file>./app/Config/Routes.php</file>
21+
</exclude>
22+
<report>
23+
<clover outputFile="build/logs/clover.xml"/>
24+
<html outputDirectory="build/logs/html"/>
25+
<php outputFile="build/logs/coverage.serialized"/>
26+
<text outputFile="php://stdout" showUncoveredFiles="false"/>
27+
</report>
28+
</coverage>
1229
<testsuites>
1330
<testsuite name="App">
1431
<directory>./tests</directory>
1532
</testsuite>
1633
</testsuites>
17-
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-
2834
<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"/>
35+
<testdoxHtml outputFile="build/logs/testdox.html"/>
36+
<testdoxText outputFile="build/logs/testdox.txt"/>
37+
<junit outputFile="build/logs/logfile.xml"/>
3638
</logging>
37-
3839
<php>
3940
<server name="app.baseURL" value="http://example.com/"/>
40-
4141
<!-- Directory containing phpunit.xml -->
4242
<const name="HOMEPATH" value="./"/>
43-
4443
<!-- Directory containing the Paths config file -->
4544
<const name="CONFIGPATH" value="./app/Config/"/>
46-
4745
<!-- Directory containing the front controller (index.php) -->
4846
<const name="PUBLICPATH" value="./public/"/>
49-
5047
<!-- 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"/>
48+
<!-- Uncomment to provide your own database for testing
49+
<env name="database.tests.hostname" value="localhost"/>
50+
<env name="database.tests.database" value="tests"/>
51+
<env name="database.tests.username" value="tests_user"/>
52+
<env name="database.tests.password" value=""/>
53+
<env name="database.tests.DBDriver" value="MySQLi"/>
54+
<env name="database.tests.DBPrefix" value="tests_"/>
55+
-->
5956
</php>
6057
</phpunit>

‎public/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
// Valid PHP Version?
4-
$minPHPVersion = '7.2';
4+
$minPHPVersion = '7.3';
55
if (version_compare(PHP_VERSION, $minPHPVersion, '<'))
66
{
77
die("Your PHP version must be {$minPHPVersion} or higher to run CodeIgniter. Current version: " . PHP_VERSION);

0 commit comments

Comments
 (0)
Please sign in to comment.