Skip to content

Commit 2b95624

Browse files
authored
Merge pull request #4802 from paulbalandan/phpdoc-param-return-types
Phpdoc param return types
2 parents 5310253 + cbfe80d commit 2b95624

File tree

236 files changed

+2550
-2211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+2550
-2211
lines changed

admin/module/tests/_support/DatabaseTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class DatabaseTestCase extends CIUnitTestCase
1212
/**
1313
* Should the database be refreshed before each test?
1414
*
15-
* @var boolean
15+
* @var bool
1616
*/
1717
protected $refresh = true;
1818

admin/module/tests/_support/Libraries/ConfigReader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
* THE SOFTWARE.
3131
*
3232
* @package CodeIgniter
33+
*
3334
* @author CodeIgniter Dev Team
3435
* @copyright 2019-2021 CodeIgniter Foundation
3536
* @license https://opensource.org/licenses/MIT MIT License
37+
*
3638
* @link https://codeigniter.com
3739
* @since Version 4.0.0
3840
* @filesource

admin/starter/tests/_support/DatabaseTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class DatabaseTestCase extends CIUnitTestCase
1212
/**
1313
* Should the database be refreshed before each test?
1414
*
15-
* @var boolean
15+
* @var bool
1616
*/
1717
protected $refresh = true;
1818

admin/starter/tests/_support/Libraries/ConfigReader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
* THE SOFTWARE.
3131
*
3232
* @package CodeIgniter
33+
*
3334
* @author CodeIgniter Dev Team
3435
* @copyright 2019-2021 CodeIgniter Foundation
3536
* @license https://opensource.org/licenses/MIT MIT License
37+
*
3638
* @link https://codeigniter.com
3739
* @since Version 4.0.0
3840
* @filesource

app/Config/App.php

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class App extends BaseConfig
8181
*
8282
* If false, no automatic detection will be performed.
8383
*
84-
* @var boolean
84+
* @var bool
8585
*/
8686
public $negotiateLocale = false;
8787

@@ -134,7 +134,7 @@ class App extends BaseConfig
134134
* secure, the user will be redirected to a secure version of the page
135135
* and the HTTP Strict Transport Security header will be set.
136136
*
137-
* @var boolean
137+
* @var bool
138138
*/
139139
public $forceGlobalSecureRequests = false;
140140

@@ -172,7 +172,7 @@ class App extends BaseConfig
172172
* The number of SECONDS you want the session to last.
173173
* Setting to 0 (zero) means expire when the browser is closed.
174174
*
175-
* @var integer
175+
* @var int
176176
*/
177177
public $sessionExpiration = 7200;
178178

@@ -205,7 +205,7 @@ class App extends BaseConfig
205205
* WARNING: If you're using the database driver, don't forget to update
206206
* your session table's PRIMARY KEY when changing this setting.
207207
*
208-
* @var boolean
208+
* @var bool
209209
*/
210210
public $sessionMatchIP = false;
211211

@@ -216,7 +216,7 @@ class App extends BaseConfig
216216
*
217217
* How many seconds between CI regenerating the session ID.
218218
*
219-
* @var integer
219+
* @var int
220220
*/
221221
public $sessionTimeToUpdate = 300;
222222

@@ -229,7 +229,7 @@ class App extends BaseConfig
229229
* when auto-regenerating the session ID. When set to FALSE, the data
230230
* will be later deleted by the garbage collector.
231231
*
232-
* @var boolean
232+
* @var bool
233233
*/
234234
public $sessionRegenerateDestroy = false;
235235

@@ -279,7 +279,7 @@ class App extends BaseConfig
279279
*
280280
* Cookie will only be set if a secure HTTPS connection exists.
281281
*
282-
* @var boolean
282+
* @var bool
283283
*
284284
* @deprecated use Config\Cookie::$secure property instead.
285285
*/
@@ -292,7 +292,7 @@ class App extends BaseConfig
292292
*
293293
* Cookie will only be accessible via HTTP(S) (no JavaScript).
294294
*
295-
* @var boolean
295+
* @var bool
296296
*
297297
* @deprecated use Config\Cookie::$httponly property instead.
298298
*/
@@ -392,7 +392,7 @@ class App extends BaseConfig
392392
*
393393
* @deprecated Use `Config\Security` $expire property instead of using this property.
394394
*
395-
* @var integer
395+
* @var int
396396
*/
397397
public $CSRFExpire = 7200;
398398

@@ -405,7 +405,7 @@ class App extends BaseConfig
405405
*
406406
* @deprecated Use `Config\Security` $regenerate property instead of using this property.
407407
*
408-
* @var boolean
408+
* @var bool
409409
*/
410410
public $CSRFRegenerate = true;
411411

@@ -418,7 +418,7 @@ class App extends BaseConfig
418418
*
419419
* @deprecated Use `Config\Security` $redirect property instead of using this property.
420420
*
421-
* @var boolean
421+
* @var bool
422422
*/
423423
public $CSRFRedirect = true;
424424

@@ -436,7 +436,6 @@ class App extends BaseConfig
436436
* Defaults to `Lax` as recommended in this link:
437437
*
438438
* @see https://portswigger.net/web-security/csrf/samesite-cookies
439-
*
440439
* @deprecated Use `Config\Security` $samesite property instead of using this property.
441440
*
442441
* @var string
@@ -459,7 +458,7 @@ class App extends BaseConfig
459458
* @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
460459
* @see http://www.w3.org/TR/CSP/
461460
*
462-
* @var boolean
461+
* @var bool
463462
*/
464463
public $CSPEnabled = false;
465464
}

app/Config/Autoload.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class Autoload extends AutoloadConfig
3737
* 'App' => APPPATH
3838
* ];
3939
*```
40+
*
4041
* @var array<string, string>
4142
*/
4243
public $psr4 = [
@@ -60,6 +61,7 @@ class Autoload extends AutoloadConfig
6061
* 'MyClass' => '/path/to/class/file.php'
6162
* ];
6263
*```
64+
*
6365
* @var array<string, string>
6466
*/
6567
public $classmap = [];
@@ -78,6 +80,7 @@ class Autoload extends AutoloadConfig
7880
* '/path/to/my/file.php',
7981
* ];
8082
* ```
83+
*
8184
* @var array<int, string>
8285
*/
8386
public $files = [];

app/Config/Cache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Cache extends BaseConfig
6666
* array('q') = Enabled, but only take into account the specified list
6767
* of query parameters.
6868
*
69-
* @var boolean|string[]
69+
* @var bool|string[]
7070
*/
7171
public $cacheQueryString = false;
7272

@@ -93,7 +93,7 @@ class Cache extends BaseConfig
9393
* hard-coded, but may be useful to projects and modules. This will replace
9494
* the hard-coded value in a future release.
9595
*
96-
* @var integer
96+
* @var int
9797
*/
9898
public $ttl = 60;
9999

app/Config/ContentSecurityPolicy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ContentSecurityPolicy extends BaseConfig
2222
/**
2323
* Default CSP report context
2424
*
25-
* @var boolean
25+
* @var bool
2626
*/
2727
public $reportOnly = false;
2828

@@ -39,7 +39,7 @@ class ContentSecurityPolicy extends BaseConfig
3939
* HTTP to HTTPS. This directive is for websites with
4040
* large numbers of old URLs that need to be rewritten.
4141
*
42-
* @var boolean
42+
* @var bool
4343
*/
4444
public $upgradeInsecureRequests = false;
4545

app/Config/Cookie.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Cookie extends BaseConfig
2727
* cookie will not have the `Expires` attribute and will behave as a session
2828
* cookie.
2929
*
30-
* @var DateTimeInterface|integer|string
30+
* @var DateTimeInterface|int|string
3131
*/
3232
public $expires = 0;
3333

@@ -60,7 +60,7 @@ class Cookie extends BaseConfig
6060
*
6161
* Cookie will only be set if a secure HTTPS connection exists.
6262
*
63-
* @var boolean
63+
* @var bool
6464
*/
6565
public $secure = false;
6666

@@ -71,7 +71,7 @@ class Cookie extends BaseConfig
7171
*
7272
* Cookie will only be accessible via HTTP(S) (no JavaScript).
7373
*
74-
* @var boolean
74+
* @var bool
7575
*/
7676
public $httponly = true;
7777

@@ -110,7 +110,7 @@ class Cookie extends BaseConfig
110110
* If this is set to `true`, cookie names should be compliant of RFC 2616's
111111
* list of allowed characters.
112112
*
113-
* @var boolean
113+
* @var bool
114114
*
115115
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
116116
* @see https://tools.ietf.org/html/rfc2616#section-2.2

app/Config/Email.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ class Email extends BaseConfig
6666
/**
6767
* SMTP Port
6868
*
69-
* @var integer
69+
* @var int
7070
*/
7171
public $SMTPPort = 25;
7272

7373
/**
7474
* SMTP Timeout (in seconds)
7575
*
76-
* @var integer
76+
* @var int
7777
*/
7878
public $SMTPTimeout = 5;
7979

8080
/**
8181
* Enable persistent SMTP connections
8282
*
83-
* @var boolean
83+
* @var bool
8484
*/
8585
public $SMTPKeepAlive = false;
8686

@@ -94,14 +94,14 @@ class Email extends BaseConfig
9494
/**
9595
* Enable word-wrap
9696
*
97-
* @var boolean
97+
* @var bool
9898
*/
9999
public $wordWrap = true;
100100

101101
/**
102102
* Character count to wrap at
103103
*
104-
* @var integer
104+
* @var int
105105
*/
106106
public $wrapChars = 76;
107107

@@ -122,14 +122,14 @@ class Email extends BaseConfig
122122
/**
123123
* Whether to validate the email address
124124
*
125-
* @var boolean
125+
* @var bool
126126
*/
127127
public $validate = false;
128128

129129
/**
130130
* Email Priority. 1 = highest. 5 = lowest. 3 = normal
131131
*
132-
* @var integer
132+
* @var int
133133
*/
134134
public $priority = 3;
135135

@@ -150,21 +150,21 @@ class Email extends BaseConfig
150150
/**
151151
* Enable BCC Batch Mode.
152152
*
153-
* @var boolean
153+
* @var bool
154154
*/
155155
public $BCCBatchMode = false;
156156

157157
/**
158158
* Number of emails in each BCC batch
159159
*
160-
* @var integer
160+
* @var int
161161
*/
162162
public $BCCBatchSize = 200;
163163

164164
/**
165165
* Enable notify message from server
166166
*
167-
* @var boolean
167+
* @var bool
168168
*/
169169
public $DSN = false;
170170
}

app/Config/Encryption.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Encryption extends BaseConfig
5050
*
5151
* See the user guide for more information on padding.
5252
*
53-
* @var integer
53+
* @var int
5454
*/
5555
public $blockSize = 16;
5656

app/Config/Exceptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Exceptions extends BaseConfig
1818
*
1919
* Default: true
2020
*
21-
* @var boolean
21+
* @var bool
2222
*/
2323
public $log = true;
2424

app/Config/Honeypot.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Honeypot extends BaseConfig
99
/**
1010
* Makes Honeypot visible or not to human
1111
*
12-
* @var boolean
12+
* @var bool
1313
*/
1414
public $hidden = true;
1515

app/Config/Logger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Logger extends BaseConfig
3535
* For a live site you'll usually enable Critical or higher (3) to be logged otherwise
3636
* your log files will fill up very fast.
3737
*
38-
* @var integer|array
38+
* @var int|array
3939
*/
4040
public $threshold = 4;
4141

app/Config/Migrations.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Migrations extends BaseConfig
1616
* You should enable migrations whenever you intend to do a schema migration
1717
* and disable it back when you're done.
1818
*
19-
* @var boolean
19+
* @var bool
2020
*/
2121
public $enabled = true;
2222

0 commit comments

Comments
 (0)