Skip to content

Commit 0c066db

Browse files
authored
Merge pull request #493 from michalsn/ci463
Patch framework (v4.6.1 => v4.6.3)
2 parents f741495 + c8dfab0 commit 0c066db

File tree

7 files changed

+218
-151
lines changed

7 files changed

+218
-151
lines changed

.github/workflows/infection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ jobs:
6565
- name: Run Infection for added files only
6666
run: |
6767
git fetch --depth=1 origin $GITHUB_BASE_REF
68-
infection --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --only-covered --logger-github
68+
infection --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --logger-github
6969
env:
7070
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/Config/Cache.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Cache extends BaseConfig
7777
* Your file storage preferences can be specified below, if you are using
7878
* the File driver.
7979
*
80-
* @var array<string, int|string|null>
80+
* @var array{storePath?: string, mode?: int}
8181
*/
8282
public array $file = [
8383
'storePath' => WRITEPATH . 'cache/',
@@ -94,7 +94,7 @@ class Cache extends BaseConfig
9494
*
9595
* @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
9696
*
97-
* @var array<string, bool|int|string>
97+
* @var array{host?: string, port?: int, weight?: int, raw?: bool}
9898
*/
9999
public array $memcached = [
100100
'host' => '127.0.0.1',
@@ -111,7 +111,7 @@ class Cache extends BaseConfig
111111
* Your Redis server can be specified below, if you are using
112112
* the Redis or Predis drivers.
113113
*
114-
* @var array<string, int|string|null>
114+
* @var array{host?: string, password?: string|null, port?: int, timeout?: int, database?: int}
115115
*/
116116
public array $redis = [
117117
'host' => '127.0.0.1',

app/Config/Cookie.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class Cookie extends BaseConfig
8585
* (empty string) means default SameSite attribute set by browsers (`Lax`)
8686
* will be set on cookies. If set to `None`, `$secure` must also be set.
8787
*
88-
* @phpstan-var 'None'|'Lax'|'Strict'|''
88+
* @var ''|'Lax'|'None'|'Strict'
8989
*/
9090
public string $samesite = 'Lax';
9191

app/Config/Filters.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ class Filters extends BaseFilters
6565
* List of filter aliases that are always
6666
* applied before and after every request.
6767
*
68-
* @var array<string, array<string, array<string, string>>>|array<string, list<string>>
68+
* @var array{
69+
* before: array<string, array{except: list<string>|string}>|list<string>,
70+
* after: array<string, array{except: list<string>|string}>|list<string>
71+
* }
6972
*/
7073
public array $globals = [
7174
'before' => [

app/Config/Logger.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use CodeIgniter\Config\BaseConfig;
66
use CodeIgniter\Log\Handlers\FileHandler;
7+
use CodeIgniter\Log\Handlers\HandlerInterface;
78

89
class Logger extends BaseConfig
910
{
@@ -73,7 +74,7 @@ class Logger extends BaseConfig
7374
* Handlers are executed in the order defined in this array, starting with
7475
* the handler on top and continuing down.
7576
*
76-
* @var array<class-string, array<string, int|list<string>|string>>
77+
* @var array<class-string<HandlerInterface>, array<string, int|list<string>|string>>
7778
*/
7879
public array $handlers = [
7980
/*

app/Views/errors/html/error_exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- Header -->
2525
<div class="header">
2626
<div class="environment">
27-
Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
27+
Displayed at <?= esc(date('H:i:s')) ?> &mdash;
2828
PHP: <?= esc(PHP_VERSION) ?> &mdash;
2929
CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
3030
Environment: <?= ENVIRONMENT ?>

0 commit comments

Comments
 (0)