Skip to content

Phpdoc param return types #4802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all 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: 1 addition & 1 deletion admin/module/tests/_support/DatabaseTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class DatabaseTestCase extends CIUnitTestCase
/**
* Should the database be refreshed before each test?
*
* @var boolean
* @var bool
*/
protected $refresh = true;

Expand Down
2 changes: 2 additions & 0 deletions admin/module/tests/_support/Libraries/ConfigReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
* THE SOFTWARE.
*
* @package CodeIgniter
*
* @author CodeIgniter Dev Team
* @copyright 2019-2021 CodeIgniter Foundation
* @license https://opensource.org/licenses/MIT MIT License
*
* @link https://codeigniter.com
* @since Version 4.0.0
* @filesource
Expand Down
2 changes: 1 addition & 1 deletion admin/starter/tests/_support/DatabaseTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class DatabaseTestCase extends CIUnitTestCase
/**
* Should the database be refreshed before each test?
*
* @var boolean
* @var bool
*/
protected $refresh = true;

Expand Down
2 changes: 2 additions & 0 deletions admin/starter/tests/_support/Libraries/ConfigReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
* THE SOFTWARE.
*
* @package CodeIgniter
*
* @author CodeIgniter Dev Team
* @copyright 2019-2021 CodeIgniter Foundation
* @license https://opensource.org/licenses/MIT MIT License
*
* @link https://codeigniter.com
* @since Version 4.0.0
* @filesource
Expand Down
25 changes: 12 additions & 13 deletions app/Config/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class App extends BaseConfig
*
* If false, no automatic detection will be performed.
*
* @var boolean
* @var bool
*/
public $negotiateLocale = false;

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

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

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

Expand All @@ -216,7 +216,7 @@ class App extends BaseConfig
*
* How many seconds between CI regenerating the session ID.
*
* @var integer
* @var int
*/
public $sessionTimeToUpdate = 300;

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

Expand Down Expand Up @@ -279,7 +279,7 @@ class App extends BaseConfig
*
* Cookie will only be set if a secure HTTPS connection exists.
*
* @var boolean
* @var bool
*
* @deprecated use Config\Cookie::$secure property instead.
*/
Expand All @@ -292,7 +292,7 @@ class App extends BaseConfig
*
* Cookie will only be accessible via HTTP(S) (no JavaScript).
*
* @var boolean
* @var bool
*
* @deprecated use Config\Cookie::$httponly property instead.
*/
Expand Down Expand Up @@ -392,7 +392,7 @@ class App extends BaseConfig
*
* @deprecated Use `Config\Security` $expire property instead of using this property.
*
* @var integer
* @var int
*/
public $CSRFExpire = 7200;

Expand All @@ -405,7 +405,7 @@ class App extends BaseConfig
*
* @deprecated Use `Config\Security` $regenerate property instead of using this property.
*
* @var boolean
* @var bool
*/
public $CSRFRegenerate = true;

Expand All @@ -418,7 +418,7 @@ class App extends BaseConfig
*
* @deprecated Use `Config\Security` $redirect property instead of using this property.
*
* @var boolean
* @var bool
*/
public $CSRFRedirect = true;

Expand All @@ -436,7 +436,6 @@ class App extends BaseConfig
* Defaults to `Lax` as recommended in this link:
*
* @see https://portswigger.net/web-security/csrf/samesite-cookies
*
* @deprecated Use `Config\Security` $samesite property instead of using this property.
*
* @var string
Expand All @@ -459,7 +458,7 @@ class App extends BaseConfig
* @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
* @see http://www.w3.org/TR/CSP/
*
* @var boolean
* @var bool
*/
public $CSPEnabled = false;
}
3 changes: 3 additions & 0 deletions app/Config/Autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class Autoload extends AutoloadConfig
* 'App' => APPPATH
* ];
*```
*
* @var array<string, string>
*/
public $psr4 = [
Expand All @@ -60,6 +61,7 @@ class Autoload extends AutoloadConfig
* 'MyClass' => '/path/to/class/file.php'
* ];
*```
*
* @var array<string, string>
*/
public $classmap = [];
Expand All @@ -78,6 +80,7 @@ class Autoload extends AutoloadConfig
* '/path/to/my/file.php',
* ];
* ```
*
* @var array<int, string>
*/
public $files = [];
Expand Down
4 changes: 2 additions & 2 deletions app/Config/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Cache extends BaseConfig
* array('q') = Enabled, but only take into account the specified list
* of query parameters.
*
* @var boolean|string[]
* @var bool|string[]
*/
public $cacheQueryString = false;

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

Expand Down
4 changes: 2 additions & 2 deletions app/Config/ContentSecurityPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ContentSecurityPolicy extends BaseConfig
/**
* Default CSP report context
*
* @var boolean
* @var bool
*/
public $reportOnly = false;

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

Expand Down
8 changes: 4 additions & 4 deletions app/Config/Cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Cookie extends BaseConfig
* cookie will not have the `Expires` attribute and will behave as a session
* cookie.
*
* @var DateTimeInterface|integer|string
* @var DateTimeInterface|int|string
*/
public $expires = 0;

Expand Down Expand Up @@ -60,7 +60,7 @@ class Cookie extends BaseConfig
*
* Cookie will only be set if a secure HTTPS connection exists.
*
* @var boolean
* @var bool
*/
public $secure = false;

Expand All @@ -71,7 +71,7 @@ class Cookie extends BaseConfig
*
* Cookie will only be accessible via HTTP(S) (no JavaScript).
*
* @var boolean
* @var bool
*/
public $httponly = true;

Expand Down Expand Up @@ -110,7 +110,7 @@ class Cookie extends BaseConfig
* If this is set to `true`, cookie names should be compliant of RFC 2616's
* list of allowed characters.
*
* @var boolean
* @var bool
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
* @see https://tools.ietf.org/html/rfc2616#section-2.2
Expand Down
20 changes: 10 additions & 10 deletions app/Config/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@ class Email extends BaseConfig
/**
* SMTP Port
*
* @var integer
* @var int
*/
public $SMTPPort = 25;

/**
* SMTP Timeout (in seconds)
*
* @var integer
* @var int
*/
public $SMTPTimeout = 5;

/**
* Enable persistent SMTP connections
*
* @var boolean
* @var bool
*/
public $SMTPKeepAlive = false;

Expand All @@ -94,14 +94,14 @@ class Email extends BaseConfig
/**
* Enable word-wrap
*
* @var boolean
* @var bool
*/
public $wordWrap = true;

/**
* Character count to wrap at
*
* @var integer
* @var int
*/
public $wrapChars = 76;

Expand All @@ -122,14 +122,14 @@ class Email extends BaseConfig
/**
* Whether to validate the email address
*
* @var boolean
* @var bool
*/
public $validate = false;

/**
* Email Priority. 1 = highest. 5 = lowest. 3 = normal
*
* @var integer
* @var int
*/
public $priority = 3;

Expand All @@ -150,21 +150,21 @@ class Email extends BaseConfig
/**
* Enable BCC Batch Mode.
*
* @var boolean
* @var bool
*/
public $BCCBatchMode = false;

/**
* Number of emails in each BCC batch
*
* @var integer
* @var int
*/
public $BCCBatchSize = 200;

/**
* Enable notify message from server
*
* @var boolean
* @var bool
*/
public $DSN = false;
}
2 changes: 1 addition & 1 deletion app/Config/Encryption.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Encryption extends BaseConfig
*
* See the user guide for more information on padding.
*
* @var integer
* @var int
*/
public $blockSize = 16;

Expand Down
2 changes: 1 addition & 1 deletion app/Config/Exceptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Exceptions extends BaseConfig
*
* Default: true
*
* @var boolean
* @var bool
*/
public $log = true;

Expand Down
2 changes: 1 addition & 1 deletion app/Config/Honeypot.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Honeypot extends BaseConfig
/**
* Makes Honeypot visible or not to human
*
* @var boolean
* @var bool
*/
public $hidden = true;

Expand Down
2 changes: 1 addition & 1 deletion app/Config/Logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Logger extends BaseConfig
* For a live site you'll usually enable Critical or higher (3) to be logged otherwise
* your log files will fill up very fast.
*
* @var integer|array
* @var int|array
*/
public $threshold = 4;

Expand Down
2 changes: 1 addition & 1 deletion app/Config/Migrations.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Migrations extends BaseConfig
* You should enable migrations whenever you intend to do a schema migration
* and disable it back when you're done.
*
* @var boolean
* @var bool
*/
public $enabled = true;

Expand Down
Loading