Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/deptrac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ on:
jobs:
deptrac:
uses: codeigniter4/.github/.github/workflows/deptrac.yml@CI46
with:
php-version: '8.2'
2 changes: 2 additions & 0 deletions .github/workflows/infection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ on:
jobs:
infection:
uses: codeigniter4/.github/.github/workflows/infection.yml@CI46
with:
php-version: '8.2'
1 change: 1 addition & 0 deletions .github/workflows/phpcpd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ jobs:
uses: codeigniter4/.github/.github/workflows/phpcpd.yml@CI46
with:
dirs: "src/ tests/"
php-version: '8.2'
7 changes: 7 additions & 0 deletions .github/workflows/phpcsfixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,11 @@ on:

jobs:
phpcsfixer:
strategy:
fail-fast: false
matrix:
php-version: ['8.2', '8.4']

uses: codeigniter4/.github/.github/workflows/phpcsfixer.yml@CI46
with:
php-version: ${{ matrix.php-version }}
7 changes: 7 additions & 0 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,11 @@ on:

jobs:
phpstan:
strategy:
fail-fast: false
matrix:
php-version: ['8.2', '8.4']

uses: codeigniter4/.github/.github/workflows/phpstan.yml@CI46
with:
php-version: ${{ matrix.php-version }}
31 changes: 31 additions & 0 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,35 @@ on:

jobs:
phpunit:
strategy:
matrix:
php-version: ['8.2', '8.3', '8.4']
db-platform: ['MySQLi', 'SQLite3']
mysql-version: ['8.0']
dependencies: ['highest']
include:
# MySQL 5.7
- php-version: '8.2'
db-platform: MySQLi
mysql-version: '5.7'
# Postgre
- php-version: '8.2'
db-platform: Postgre
mysql-version: '8.0'
# SQLSRV
- php-version: '8.2'
db-platform: SQLSRV
mysql-version: '8.0'
# OCI8
- php-version: '8.2'
db-platform: OCI8
mysql-version: '8.0'

uses: codeigniter4/.github/.github/workflows/phpunit.yml@CI46
with:
php-version: ${{ matrix.php-version }}
db-platform: ${{ matrix.db-platform }}
mysql-version: ${{ matrix.mysql-version }}
dependencies: ${{ matrix.dependencies }}
coveralls-php: '8.2'

2 changes: 2 additions & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ on:
jobs:
psalm:
uses: codeigniter4/.github/.github/workflows/psalm.yml@CI46
with:
php-version: '8.2'
7 changes: 7 additions & 0 deletions .github/workflows/rector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,11 @@ on:

jobs:
rector:
strategy:
fail-fast: false
matrix:
php-version: ['8.2', '8.4']

uses: codeigniter4/.github/.github/workflows/rector.yml@CI46
with:
php-version: ${{ matrix.php-version }}
2 changes: 2 additions & 0 deletions .github/workflows/unused.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ on:
jobs:
unused:
uses: codeigniter4/.github/.github/workflows/unused.yml@CI46
with:
php-version: '8.2'
2 changes: 0 additions & 2 deletions app/Config/Autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
*
* NOTE: This class is required prior to Autoloader instantiation,
* and does not extend BaseConfig.
*
* @immutable
*/
class Autoload extends AutoloadConfig
{
Expand Down
7 changes: 4 additions & 3 deletions app/Config/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class Cache extends BaseConfig
* Your file storage preferences can be specified below, if you are using
* the File driver.
*
* @var array<string, int|string|null>
* @var array{storePath?: string, mode?: int}
*/
public array $file = [
'storePath' => WRITEPATH . 'cache/',
Expand All @@ -95,7 +95,7 @@ class Cache extends BaseConfig
*
* @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
*
* @var array<string, bool|int|string>
* @var array{host?: string, port?: int, weight?: int, raw?: bool}
*/
public array $memcached = [
'host' => '127.0.0.1',
Expand All @@ -108,10 +108,11 @@ class Cache extends BaseConfig
* -------------------------------------------------------------------------
* Redis settings
* -------------------------------------------------------------------------
*
* Your Redis server can be specified below, if you are using
* the Redis or Predis drivers.
*
* @var array<string, int|string|null>
* @var array{host?: string, password?: string|null, port?: int, timeout?: int, database?: int}
*/
public array $redis = [
'host' => '127.0.0.1',
Expand Down
2 changes: 1 addition & 1 deletion app/Config/Cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Cookie extends BaseConfig
* (empty string) means default SameSite attribute set by browsers (`Lax`)
* will be set on cookies. If set to `None`, `$secure` must also be set.
*
* @phpstan-var 'None'|'Lax'|'Strict'|''
* @var ''|'Lax'|'None'|'Strict'
*/
public string $samesite = 'Lax';

Expand Down
3 changes: 0 additions & 3 deletions app/Config/DocTypes.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

namespace Config;

/**
* @immutable
*/
class DocTypes
{
/**
Expand Down
5 changes: 4 additions & 1 deletion app/Config/Filters.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ class Filters extends BaseFilters
* List of filter aliases that are always
* applied before and after every request.
*
* @var array<string, array<string, array<string, string>>>|array<string, list<string>>
* @var array{
* before: array<string, array{except: list<string>|string}>|list<string>,
* after: array<string, array{except: list<string>|string}>|list<string>
* }
*/
public array $globals = [
'before' => [
Expand Down
3 changes: 2 additions & 1 deletion app/Config/Logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use CodeIgniter\Config\BaseConfig;
use CodeIgniter\Log\Handlers\FileHandler;
use CodeIgniter\Log\Handlers\HandlerInterface;

class Logger extends BaseConfig
{
Expand Down Expand Up @@ -73,7 +74,7 @@ class Logger extends BaseConfig
* Handlers are executed in the order defined in this array, starting with
* the handler on top and continuing down.
*
* @var array<class-string, array<string, int|list<string>|string>>
* @var array<class-string<HandlerInterface>, array<string, int|list<string>|string>>
*/
public array $handlers = [
/*
Expand Down
6 changes: 2 additions & 4 deletions app/Config/Mimes.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
namespace Config;

/**
* Mimes
*
* This file contains an array of mime types. It is used by the
* Upload class to help identify allowed file types.
*
Expand All @@ -15,8 +13,6 @@
*
* When working with mime types, please make sure you have the ´fileinfo´
* extension enabled to reliably detect the media types.
*
* @immutable
*/
class Mimes
{
Expand Down Expand Up @@ -482,6 +478,8 @@ class Mimes
'application/sla',
'application/vnd.ms-pki.stl',
'application/x-navistyle',
'model/stl',
'application/octet-stream',
],
];

Expand Down
2 changes: 0 additions & 2 deletions app/Config/Modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
*
* NOTE: This class is required prior to Autoloader instantiation,
* and does not extend BaseConfig.
*
* @immutable
*/
class Modules extends BaseModules
{
Expand Down
2 changes: 0 additions & 2 deletions app/Config/Optimize.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
*
* NOTE: This class does not extend BaseConfig for performance reasons.
* So you cannot replace the property values with Environment Variables.
*
* @immutable
*/
class Optimize
{
Expand Down
2 changes: 0 additions & 2 deletions app/Config/Paths.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*
* NOTE: This class is required prior to Autoloader instantiation,
* and does not extend BaseConfig.
*
* @immutable
*/
class Paths
{
Expand Down
4 changes: 2 additions & 2 deletions app/Views/errors/html/debug.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--main-text-color: #555;
--dark-text-color: #222;
--light-text-color: #c7c7c7;
--brand-primary-color: #E06E3F;
--brand-primary-color: #DC4814;
--light-bg-color: #ededee;
--dark-bg-color: #404040;
}
Expand Down Expand Up @@ -71,7 +71,7 @@ p.lead {
text-align: center;
padding: calc(4px + 0.2083vw);
width: 100%;
margin-top: -2.14rem;
top: 0;
position: fixed;
}

Expand Down
2 changes: 1 addition & 1 deletion app/Views/errors/html/error_exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- Header -->
<div class="header">
<div class="environment">
Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
Displayed at <?= esc(date('H:i:s')) ?> &mdash;
PHP: <?= esc(PHP_VERSION) ?> &mdash;
CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
Environment: <?= ENVIRONMENT ?>
Expand Down
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@
"codeigniter4/framework": "4.6.*"
},
"require-dev": {
"phpunit/phpunit": "^9.3",
"psr/container": "2.0.2",
"codeigniter4/devkit": "^1.0",
"codeigniter4/devkit": "^1.2",
"tatter/patches": "^2.1",
"liaison/revision": "^1.1",
"kint-php/kint": "^6.0",
"codeigniter/phpstan-codeigniter": "^1.4"
},
Expand Down
Loading
Loading