Skip to content

Commit

Permalink
Merge pull request #7613 from ping-yee/230624_mixed_in_system
Browse files Browse the repository at this point in the history
docs: Replace type `mixed` in system.
  • Loading branch information
kenjis authored Jun 29, 2023
2 parents 229427a + 70f566f commit eeaa556
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion system/BaseModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,7 @@ protected function transformDataToArray($data, string $type): array
*
* @param string $name Name
*
* @return mixed
* @return array|bool|float|int|object|string|null
*/
public function __get(string $name)
{
Expand Down
8 changes: 4 additions & 4 deletions system/Common.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ function app_timezone(): string
* cache()->save('foo', 'bar');
* $foo = cache('bar');
*
* @return CacheInterface|mixed
* @phpstan-return ($key is null ? CacheInterface : mixed)
* @return array|bool|CacheInterface|float|int|object|string|null
* @phpstan-return ($key is null ? CacheInterface : array|bool|float|int|object|string|null)
*/
function cache(?string $key = null)
{
Expand Down Expand Up @@ -1003,7 +1003,7 @@ function session(?string $val = null)
* - $timer = service('timer')
* - $timer = \CodeIgniter\Config\Services::timer();
*
* @param mixed ...$params
* @param array|bool|float|int|object|string|null ...$params
*
* @return object
*/
Expand All @@ -1017,7 +1017,7 @@ function service(string $name, ...$params)
/**
* Always returns a new instance of the class.
*
* @param mixed ...$params
* @param array|bool|float|int|object|string|null ...$params
*
* @return object|null
*/
Expand Down
4 changes: 2 additions & 2 deletions system/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
*
* @param string $name Name
*
* @return mixed
* @return array|BaseBuilder|bool|float|int|object|string|null
*/
public function __get(string $name)
{
Expand Down Expand Up @@ -821,7 +821,7 @@ public function __isset(string $name): bool
* Provides direct access to method in the builder (if available)
* and the database connection.
*
* @return mixed
* @return $this|array|BaseBuilder|bool|float|int|object|string|null
*/
public function __call(string $name, array $params)
{
Expand Down

0 comments on commit eeaa556

Please sign in to comment.