Skip to content

Commit 89f0360

Browse files
kenjiskenjis
committed
Merge remote-tracking branch 'upstream/develop' into 4.5
 Conflicts: psalm-baseline.xml
2 parents 772e7bb + 4d5c35c commit 89f0360

File tree

2 files changed

+61
-84
lines changed

2 files changed

+61
-84
lines changed

‎psalm-baseline.xml

Lines changed: 57 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494">
2+
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
33
<file src="app/Config/View.php">
44
<UndefinedDocblockClass>
55
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
66
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
77
<code><![CDATA[array<string, parser_callable_string>]]></code>
8-
<code>public $filters = [];</code>
9-
<code>public $plugins = [];</code>
10-
<code>public $plugins = [];</code>
8+
<code><![CDATA[public $filters = [];]]></code>
9+
<code><![CDATA[public $plugins = [];]]></code>
10+
<code><![CDATA[public $plugins = [];]]></code>
1111
</UndefinedDocblockClass>
1212
</file>
1313
<file src="system/Cache/Handlers/MemcachedHandler.php">
1414
<UndefinedClass>
15-
<code>Memcache</code>
16-
<code>Memcache</code>
17-
<code>Memcache</code>
15+
<code><![CDATA[Memcache]]></code>
16+
<code><![CDATA[Memcache]]></code>
17+
<code><![CDATA[Memcache]]></code>
1818
</UndefinedClass>
1919
<UndefinedDocblockClass>
2020
<code><![CDATA[$this->memcached]]></code>
@@ -23,130 +23,103 @@
2323
<code><![CDATA[$this->memcached]]></code>
2424
<code><![CDATA[$this->memcached]]></code>
2525
<code><![CDATA[$this->memcached]]></code>
26-
<code>Memcache|Memcached</code>
26+
<code><![CDATA[Memcache|Memcached]]></code>
2727
</UndefinedDocblockClass>
2828
</file>
29+
<file src="system/Commands/Utilities/Routes/ControllerMethodReader.php">
30+
<DuplicateArrayKey>
31+
<code><![CDATA[$routeWithoutController]]></code>
32+
<code><![CDATA[$routeWithoutController]]></code>
33+
</DuplicateArrayKey>
34+
</file>
2935
<file src="system/Config/View.php">
3036
<UndefinedDocblockClass>
31-
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
32-
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
37+
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
38+
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
3339
<code><![CDATA[array<string, parser_callable_string>]]></code>
34-
<code><![CDATA[protected $coreFilters = [
35-
'abs' => '\abs',
36-
'capitalize' => '\CodeIgniter\View\Filters::capitalize',
37-
'date' => '\CodeIgniter\View\Filters::date',
38-
'date_modify' => '\CodeIgniter\View\Filters::date_modify',
39-
'default' => '\CodeIgniter\View\Filters::default',
40-
'esc' => '\CodeIgniter\View\Filters::esc',
41-
'excerpt' => '\CodeIgniter\View\Filters::excerpt',
42-
'highlight' => '\CodeIgniter\View\Filters::highlight',
43-
'highlight_code' => '\CodeIgniter\View\Filters::highlight_code',
44-
'limit_words' => '\CodeIgniter\View\Filters::limit_words',
45-
'limit_chars' => '\CodeIgniter\View\Filters::limit_chars',
46-
'local_currency' => '\CodeIgniter\View\Filters::local_currency',
47-
'local_number' => '\CodeIgniter\View\Filters::local_number',
48-
'lower' => '\strtolower',
49-
'nl2br' => '\CodeIgniter\View\Filters::nl2br',
50-
'number_format' => '\number_format',
51-
'prose' => '\CodeIgniter\View\Filters::prose',
52-
'round' => '\CodeIgniter\View\Filters::round',
53-
'strip_tags' => '\strip_tags',
54-
'title' => '\CodeIgniter\View\Filters::title',
55-
'upper' => '\strtoupper',
56-
];]]></code>
57-
<code><![CDATA[protected $corePlugins = [
58-
'csp_script_nonce' => '\CodeIgniter\View\Plugins::cspScriptNonce',
59-
'csp_style_nonce' => '\CodeIgniter\View\Plugins::cspStyleNonce',
60-
'current_url' => '\CodeIgniter\View\Plugins::currentURL',
61-
'previous_url' => '\CodeIgniter\View\Plugins::previousURL',
62-
'mailto' => '\CodeIgniter\View\Plugins::mailto',
63-
'safe_mailto' => '\CodeIgniter\View\Plugins::safeMailto',
64-
'lang' => '\CodeIgniter\View\Plugins::lang',
65-
'validation_errors' => '\CodeIgniter\View\Plugins::validationErrors',
66-
'route' => '\CodeIgniter\View\Plugins::route',
67-
'siteURL' => '\CodeIgniter\View\Plugins::siteURL',
68-
];]]></code>
69-
<code><![CDATA[protected $corePlugins = [
70-
'csp_script_nonce' => '\CodeIgniter\View\Plugins::cspScriptNonce',
71-
'csp_style_nonce' => '\CodeIgniter\View\Plugins::cspStyleNonce',
72-
'current_url' => '\CodeIgniter\View\Plugins::currentURL',
73-
'previous_url' => '\CodeIgniter\View\Plugins::previousURL',
74-
'mailto' => '\CodeIgniter\View\Plugins::mailto',
75-
'safe_mailto' => '\CodeIgniter\View\Plugins::safeMailto',
76-
'lang' => '\CodeIgniter\View\Plugins::lang',
77-
'validation_errors' => '\CodeIgniter\View\Plugins::validationErrors',
78-
'route' => '\CodeIgniter\View\Plugins::route',
79-
'siteURL' => '\CodeIgniter\View\Plugins::siteURL',
80-
];]]></code>
8140
</UndefinedDocblockClass>
8241
</file>
8342
<file src="system/Database/BasePreparedQuery.php">
8443
<InaccessibleProperty>
8544
<code><![CDATA[$this->db->transStatus]]></code>
8645
</InaccessibleProperty>
8746
</file>
47+
<file src="system/Database/OCI8/Connection.php">
48+
<UndefinedConstant>
49+
<code><![CDATA[OCI_COMMIT_ON_SUCCESS]]></code>
50+
<code><![CDATA[OCI_COMMIT_ON_SUCCESS]]></code>
51+
<code><![CDATA[OCI_COMMIT_ON_SUCCESS]]></code>
52+
<code><![CDATA[OCI_NO_AUTO_COMMIT]]></code>
53+
<code><![CDATA[SQLT_CHR]]></code>
54+
</UndefinedConstant>
55+
</file>
8856
<file src="system/Debug/Toolbar/Views/toolbar.tpl.php">
8957
<InaccessibleMethod>
90-
<code>renderTimeline</code>
58+
<code><![CDATA[renderTimeline]]></code>
9159
</InaccessibleMethod>
9260
<UndefinedGlobalVariable>
93-
<code>$config</code>
61+
<code><![CDATA[$config]]></code>
9462
</UndefinedGlobalVariable>
9563
</file>
9664
<file src="system/Email/Email.php">
9765
<LoopInvalidation>
98-
<code>$timestamp</code>
66+
<code><![CDATA[$timestamp]]></code>
9967
</LoopInvalidation>
10068
</file>
10169
<file src="system/HTTP/Files/FileCollection.php">
10270
<EmptyArrayAccess>
103-
<code>$output[$name]</code>
71+
<code><![CDATA[$output[$name]]]></code>
10472
</EmptyArrayAccess>
10573
</file>
10674
<file src="system/Helpers/text_helper.php">
10775
<LoopInvalidation>
108-
<code>$count</code>
109-
<code>$count</code>
110-
<code>$count</code>
76+
<code><![CDATA[$count]]></code>
77+
<code><![CDATA[$count]]></code>
78+
<code><![CDATA[$count]]></code>
11179
</LoopInvalidation>
11280
</file>
11381
<file src="system/I18n/TimeTrait.php">
11482
<MissingImmutableAnnotation>
115-
<code>#[ReturnTypeWillChange]</code>
116-
<code>#[ReturnTypeWillChange]</code>
117-
<code>#[ReturnTypeWillChange]</code>
83+
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
84+
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
85+
<code><![CDATA[#[ReturnTypeWillChange]]]></code>
11886
</MissingImmutableAnnotation>
11987
</file>
12088
<file src="system/View/Parser.php">
12189
<UndefinedDocblockClass>
122-
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
123-
<code><![CDATA[array<string, list<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
124-
<code>protected $plugins = [];</code>
125-
<code>protected $plugins = [];</code>
90+
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
91+
<code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
92+
<code><![CDATA[protected $plugins = [];]]></code>
93+
<code><![CDATA[protected $plugins = [];]]></code>
12694
</UndefinedDocblockClass>
12795
</file>
12896
<file src="tests/_support/Config/Filters.php">
12997
<UndefinedGlobalVariable>
130-
<code>$filters</code>
98+
<code><![CDATA[$filters]]></code>
13199
</UndefinedGlobalVariable>
132100
</file>
133101
<file src="tests/_support/Config/Routes.php">
134102
<UndefinedGlobalVariable>
135-
<code>$routes</code>
136-
<code>$routes</code>
137-
<code>$routes</code>
138-
<code>$routes</code>
139-
<code>$routes</code>
103+
<code><![CDATA[$routes]]></code>
104+
<code><![CDATA[$routes]]></code>
105+
<code><![CDATA[$routes]]></code>
106+
<code><![CDATA[$routes]]></code>
107+
<code><![CDATA[$routes]]></code>
140108
</UndefinedGlobalVariable>
141109
</file>
142110
<file src="tests/_support/View/Cells/colors.php">
143111
<InvalidScope>
144-
<code>$this</code>
112+
<code><![CDATA[$this]]></code>
145113
</InvalidScope>
146114
</file>
115+
<file src="tests/system/CLI/ConsoleTest.php">
116+
<DuplicateArrayKey>
117+
<code><![CDATA[$command]]></code>
118+
</DuplicateArrayKey>
119+
</file>
147120
<file src="tests/system/CommonFunctionsTest.php">
148121
<UndefinedClass>
149-
<code>UnexsistenceClass</code>
122+
<code><![CDATA[UnexsistenceClass]]></code>
150123
</UndefinedClass>
151124
</file>
152125
<file src="tests/system/Config/FactoriesTest.php">
@@ -158,14 +131,14 @@
158131
</file>
159132
<file src="tests/system/Database/Live/OCI8/CallStoredProcedureTest.php">
160133
<UndefinedConstant>
161-
<code>OCI_ASSOC</code>
162-
<code>OCI_B_CURSOR</code>
163-
<code>OCI_RETURN_NULLS</code>
134+
<code><![CDATA[OCI_ASSOC]]></code>
135+
<code><![CDATA[OCI_B_CURSOR]]></code>
136+
<code><![CDATA[OCI_RETURN_NULLS]]></code>
164137
</UndefinedConstant>
165138
</file>
166139
<file src="tests/system/Entity/EntityTest.php">
167140
<EmptyArrayAccess>
168-
<code>$current[$key]</code>
141+
<code><![CDATA[$current[$key]]]></code>
169142
</EmptyArrayAccess>
170143
</file>
171144
<file src="tests/system/HTTP/RedirectResponseTest.php">
@@ -175,7 +148,7 @@
175148
</file>
176149
<file src="tests/system/Test/ControllerTestTraitTest.php">
177150
<UndefinedClass>
178-
<code>NeverHeardOfIt</code>
151+
<code><![CDATA[NeverHeardOfIt]]></code>
179152
</UndefinedClass>
180153
</file>
181154
</files>

‎system/Config/View.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ class View extends BaseConfig
6161
/**
6262
* Built-in View filters.
6363
*
64+
* @psalm-suppress UndefinedDocblockClass
65+
*
6466
* @var array<string, string>
6567
* @phpstan-var array<string, parser_callable_string>
6668
*/
@@ -91,6 +93,8 @@ class View extends BaseConfig
9193
/**
9294
* Built-in View plugins.
9395
*
96+
* @psalm-suppress UndefinedDocblockClass
97+
*
9498
* @var array<string, callable|list<string>|string>
9599
* @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
96100
*/

0 commit comments

Comments
 (0)