Skip to content

Commit eeaa556

Browse files
authored
Merge pull request #7613 from ping-yee/230624_mixed_in_system
docs: Replace type `mixed` in system.
2 parents 229427a + 70f566f commit eeaa556

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

system/BaseModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ protected function transformDataToArray($data, string $type): array
17111711
*
17121712
* @param string $name Name
17131713
*
1714-
* @return mixed
1714+
* @return array|bool|float|int|object|string|null
17151715
*/
17161716
public function __get(string $name)
17171717
{

system/Common.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ function app_timezone(): string
6565
* cache()->save('foo', 'bar');
6666
* $foo = cache('bar');
6767
*
68-
* @return CacheInterface|mixed
69-
* @phpstan-return ($key is null ? CacheInterface : mixed)
68+
* @return array|bool|CacheInterface|float|int|object|string|null
69+
* @phpstan-return ($key is null ? CacheInterface : array|bool|float|int|object|string|null)
7070
*/
7171
function cache(?string $key = null)
7272
{
@@ -1003,7 +1003,7 @@ function session(?string $val = null)
10031003
* - $timer = service('timer')
10041004
* - $timer = \CodeIgniter\Config\Services::timer();
10051005
*
1006-
* @param mixed ...$params
1006+
* @param array|bool|float|int|object|string|null ...$params
10071007
*
10081008
* @return object
10091009
*/
@@ -1017,7 +1017,7 @@ function service(string $name, ...$params)
10171017
/**
10181018
* Always returns a new instance of the class.
10191019
*
1020-
* @param mixed ...$params
1020+
* @param array|bool|float|int|object|string|null ...$params
10211021
*
10221022
* @return object|null
10231023
*/

system/Model.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
792792
*
793793
* @param string $name Name
794794
*
795-
* @return mixed
795+
* @return array|BaseBuilder|bool|float|int|object|string|null
796796
*/
797797
public function __get(string $name)
798798
{
@@ -821,7 +821,7 @@ public function __isset(string $name): bool
821821
* Provides direct access to method in the builder (if available)
822822
* and the database connection.
823823
*
824-
* @return mixed
824+
* @return $this|array|BaseBuilder|bool|float|int|object|string|null
825825
*/
826826
public function __call(string $name, array $params)
827827
{

0 commit comments

Comments
 (0)