Skip to content
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
8 changes: 4 additions & 4 deletions system/Common.php
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,9 @@ function db_connect($db = null, bool $getShared = true)
* retrieving values set from the .env file for
* use in config files.
*
* @param array<int|string, mixed>|bool|float|int|object|string|null $default
* @param mixed $default
*
* @return array<int|string, mixed>|bool|float|int|object|string|null
* @return mixed
*/
function env(string $key, $default = null)
{
Expand Down Expand Up @@ -1080,7 +1080,7 @@ function session(?string $val = null)
* - $timer = service('timer')
* - $timer = \CodeIgniter\Config\Services::timer();
*
* @param array|bool|float|int|object|string|null ...$params
* @param mixed ...$params
*/
function service(string $name, ...$params): ?object
{
Expand All @@ -1096,7 +1096,7 @@ function service(string $name, ...$params): ?object
/**
* Always returns a new instance of the class.
*
* @param array|bool|float|int|object|string|null ...$params
* @param mixed ...$params
*/
function single_service(string $name, ...$params): ?object
{
Expand Down
2 changes: 1 addition & 1 deletion system/Config/BaseConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ protected function parseEncryptionKey(string $key): string
/**
* Initialization an environment-specific configuration setting
*
* @param array|bool|float|int|string|null $property
* @param array<int|string, mixed>|bool|float|int|string|null $property
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion system/Config/BaseService.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public static function override(string $key, object $value): void
*
* $key must be a name matching a service.
*
* @param array|bool|float|int|object|string|null ...$params
* @param mixed ...$params
*
* @return object
*/
Expand Down
4 changes: 2 additions & 2 deletions system/Database/BaseBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -2817,7 +2817,7 @@ public function getCompiledDelete(bool $reset = true): string
/**
* Compiles a delete string and runs the query
*
* @param array|RawSql|string $where
* @param array<int|string, mixed>|RawSql|string $where
*
* @return bool|string Returns a SQL string if in test mode.
*
Expand Down Expand Up @@ -3075,7 +3075,7 @@ protected function trackAliases($table)
* Generates a query string based on which functions were used.
* Should not be called directly.
*
* @param mixed $selectOverride
* @param false|string $selectOverride
*/
protected function compileSelect($selectOverride = false): string
{
Expand Down
6 changes: 3 additions & 3 deletions system/Database/BaseConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ abstract protected function execute(string $sql);
* Should automatically handle different connections for read/write
* queries if needed.
*
* @param array|string|null $binds
* @param array<int|string, mixed>|string|null $binds
*
* @return BaseResult<TConnection, TResult>|bool|Query
*
Expand Down Expand Up @@ -1533,7 +1533,7 @@ abstract public function affectedRows(): int;
* Escapes data based on type.
* Sets boolean and null types
*
* @param array|bool|float|int|object|string|null $str
* @param mixed $str
*
* @return ($str is array ? array : float|int|string)
*/
Expand Down Expand Up @@ -2059,7 +2059,7 @@ protected function _enableForeignKeyChecks()
/**
* Accessor for properties if they exist.
*
* @return array|bool|float|int|object|resource|string|null
* @return mixed
*/
public function __get(string $key)
{
Expand Down
4 changes: 2 additions & 2 deletions system/Database/BaseUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function optimizeTable(string $tableName)
/**
* Optimize Database
*
* @return mixed
* @return array<string, mixed>|bool
*
* @throws DatabaseException
*/
Expand Down Expand Up @@ -170,7 +170,7 @@ public function optimizeDatabase()
/**
* Repair Table
*
* @return mixed
* @return array<string, mixed>|bool
*
* @throws DatabaseException
*/
Expand Down
6 changes: 3 additions & 3 deletions system/Database/ConnectionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function getVersion(): string;
* Should automatically handle different connections for read/write
* queries if needed.
*
* @param array|string|null $binds
* @param array<int|string, mixed>|string|null $binds
*
* @return BaseResult<TConnection, TResult>|bool|Query
*/
Expand Down Expand Up @@ -137,7 +137,7 @@ public function getLastQuery();
* Escapes data based on type.
* Sets boolean and null types.
*
* @param array|bool|float|int|object|string|null $str
* @param mixed $str
*
* @return ($str is array ? array : float|int|string)
*/
Expand All @@ -149,7 +149,7 @@ public function escape($str);
*
* @param array ...$params
*
* @return array|bool|float|int|object|resource|string|null
* @return mixed
*/
public function callFunction(string $functionName, ...$params);

Expand Down
2 changes: 1 addition & 1 deletion system/Database/OCI8/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ protected function _truncate(string $table): string
/**
* Compiles a delete string and runs the query
*
* @param mixed $where
* @param array<int|string, mixed>|RawSql|string $where
*
* @return bool|string
*
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Postgre/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
/**
* Compiles a delete string and runs the query
*
* @param mixed $where
* @param array<int|string, mixed>|RawSql|string $where
*
* @return bool|string
*
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Postgre/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public function affectedRows(): int
*
* Escapes data based on type
*
* @param array|bool|float|int|object|string|null $str
* @param mixed $str
*
* @return ($str is array ? array : float|int|string)
*/
Expand Down
4 changes: 2 additions & 2 deletions system/Database/SQLSRV/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ protected function _delete(string $table): string
/**
* Compiles a delete string and runs the query
*
* @param mixed $where
* @param array<int|string, mixed>|RawSql|string $where
*
* @return bool|string
*
Expand Down Expand Up @@ -578,7 +578,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
*
* Generates a query string based on which functions were used.
*
* @param bool $selectOverride
* @param false|string $selectOverride
*/
protected function compileSelect($selectOverride = false): string
{
Expand Down
2 changes: 1 addition & 1 deletion system/Database/SQLSRV/Forge.php
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
/**
* Drop index for table
*
* @return mixed
* @return false|resource
*/
protected function _dropIndex(string $table, object $indexData)
{
Expand Down
2 changes: 1 addition & 1 deletion system/Debug/Toolbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ public function respond(): void

// Otherwise, if it includes ?debugbar_time, then
// we should return the entire debugbar.
if ($request->getGet('debugbar_time')) {
if ($request->getGet('debugbar_time') !== null) {
helper('security');

// Negotiate the content-type to format the output
Expand Down
2 changes: 1 addition & 1 deletion system/Encryption/Handlers/BaseHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected static function substr($str, $start, $length = null)
*
* @param string $key Property name
*
* @return array|bool|int|string|null
* @return array<int|string, mixed>|bool|int|string|null
*/
public function __get($key)
{
Expand Down
2 changes: 1 addition & 1 deletion system/Encryption/KeyRotationDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function decrypt($data, #[SensitiveParameter] $params = null)
/**
* Delegate property access to the inner handler.
*
* @return array|bool|int|string|null
* @return array<int|string, mixed>|bool|int|string|null
*/
public function __get(string $key)
{
Expand Down
12 changes: 6 additions & 6 deletions system/Entity/Cast/CastInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ interface CastInterface
/**
* Takes a raw value from Entity, returns its value for PHP.
*
* @param array|bool|float|int|object|string|null $value Data
* @param array<int, string> $params Additional param
* @param mixed $value Data
* @param array<int, string> $params Additional param
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public static function get($value, array $params = []);

/**
* Takes a PHP value, returns its raw value for Entity.
*
* @param array|bool|float|int|object|string|null $value Data
* @param array<int, string> $params Additional param
* @param mixed $value Data
* @param array<int, string> $params Additional param
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public static function set($value, array $params = []);
}
8 changes: 4 additions & 4 deletions system/Entity/Entity.php
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public function __construct(?array $data = null)
* properties, using any `setCamelCasedProperty()` methods
* that may or may not exist.
*
* @param array<string, array<int|string, mixed>|bool|float|int|object|string|null> $data
* @param array<string, mixed> $data
*
* @return $this
*/
Expand Down Expand Up @@ -556,7 +556,7 @@ protected function mutateDate($value)
* @param string $attribute Attribute name
* @param string $method Allowed to "get" and "set"
*
* @return array<int|string, mixed>|bool|float|int|object|string|null
* @return mixed
*
* @throws CastException
*/
Expand Down Expand Up @@ -631,7 +631,7 @@ public function cast(?bool $cast = null)
* $this->my_property = $p;
* $this->setMyProperty() = $p;
*
* @param array<int|string, mixed>|bool|float|int|object|string|null $value
* @param mixed $value
*
* @return void
*
Expand Down Expand Up @@ -682,7 +682,7 @@ public function __set(string $key, $value = null)
* $p = $this->my_property
* $p = $this->getMyProperty()
*
* @return array<int|string, mixed>|bool|float|int|object|string|null
* @return mixed
*
* @throws Exception
*/
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/CURLRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public function setForm(array $params, bool $multipart = false)
/**
* Set JSON data to be sent.
*
* @param array|bool|float|int|object|string|null $data
* @param mixed $data
*
* @return $this
*/
Expand Down
18 changes: 9 additions & 9 deletions system/HTTP/IncomingRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ public function getDefaultLocale(): string
* @param int|null $filter Filter constant
* @param array|int|null $flags
*
* @return array|bool|float|int|stdClass|string|null
* @return array<int|string, mixed>|bool|float|int|stdClass|string|null
*/
public function getVar($index = null, $filter = null, $flags = null)
{
Expand All @@ -390,7 +390,7 @@ public function getVar($index = null, $filter = null, $flags = null)
*
* @see http://php.net/manual/en/function.json-decode.php
*
* @return array|bool|float|int|stdClass|null
* @return array<int|string, mixed>|bool|float|int|stdClass|null
*
* @throws HTTPException When the body is invalid as JSON.
*/
Expand All @@ -417,7 +417,7 @@ public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
* @param int|null $filter Filter Constant
* @param array|int|null $flags Option
*
* @return array|bool|float|int|stdClass|string|null
* @return array<int|string, mixed>|bool|float|int|stdClass|string|null
*/
public function getJsonVar($index = null, bool $assoc = false, ?int $filter = null, $flags = null)
{
Expand Down Expand Up @@ -508,7 +508,7 @@ public function getRawInput()
* @param int|null $filter Filter Constant
* @param array|int|null $flags Option
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public function getRawInputVar($index = null, ?int $filter = null, $flags = null)
{
Expand Down Expand Up @@ -562,7 +562,7 @@ public function getRawInputVar($index = null, ?int $filter = null, $flags = null
* @param int|null $filter A filter name to apply.
* @param array|int|null $flags
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public function getGet($index = null, $filter = null, $flags = null)
{
Expand All @@ -576,7 +576,7 @@ public function getGet($index = null, $filter = null, $flags = null)
* @param int|null $filter A filter name to apply
* @param array|int|null $flags
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public function getPost($index = null, $filter = null, $flags = null)
{
Expand All @@ -590,7 +590,7 @@ public function getPost($index = null, $filter = null, $flags = null)
* @param int|null $filter A filter name to apply
* @param array|int|null $flags
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public function getPostGet($index = null, $filter = null, $flags = null)
{
Expand All @@ -613,7 +613,7 @@ public function getPostGet($index = null, $filter = null, $flags = null)
* @param int|null $filter A filter name to apply
* @param array|int|null $flags
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public function getGetPost($index = null, $filter = null, $flags = null)
{
Expand All @@ -636,7 +636,7 @@ public function getGetPost($index = null, $filter = null, $flags = null)
* @param int|null $filter A filter name to be applied
* @param array|int|null $flags
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public function getCookie($index = null, $filter = null, $flags = null)
{
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/RequestTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public function setGlobal(string $name, $value)
* @param int|null $filter Filter constant
* @param array|int|null $flags Options
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
public function fetchGlobal(string $name, $index = null, ?int $filter = null, $flags = null)
{
Expand Down
4 changes: 2 additions & 2 deletions system/Helpers/Array/ArrayHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ final class ArrayHelper
*
* @param string $index The index as dot array syntax.
*
* @return array|bool|int|object|string|null
* @return mixed
*/
public static function dotSearch(string $index, array $array)
{
Expand Down Expand Up @@ -68,7 +68,7 @@ private static function convertToArray(string $index): array
*
* @used-by dotSearch()
*
* @return array|bool|float|int|object|string|null
* @return mixed
*/
private static function arraySearchDot(array $indexes, array $array)
{
Expand Down
Loading
Loading