Skip to content
Open
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 system/Database/BasePreparedQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ abstract public function _execute(array $data): bool;
/**
* Returns the result object for the prepared query.
*
* @return object|resource|null
* @return false|object|resource|null
*/
abstract public function _getResult();

Expand Down
2 changes: 1 addition & 1 deletion system/Database/ConnectionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function getDatabase(): string;
* Must return this format: ['code' => string|int, 'message' => string]
* intval(code) === 0 means "no error".
*
* @return array<string, int|string>
* @return array{code: int|string|null, message: string|null}
*/
public function error(): array;

Expand Down
2 changes: 1 addition & 1 deletion system/Database/MySQLi/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ protected function _enableForeignKeyChecks()
* Must return this format: ['code' => string|int, 'message' => string]
* intval(code) === 0 means "no error".
*
* @return array<string, int|string>
* @return array{code: int|string|null, message: string|null}
*/
public function error(): array
{
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 @@ -152,7 +152,7 @@ protected function _truncate(string $table): string
*
* @param mixed $where
*
* @return mixed
* @return bool|string
*
* @throws DatabaseException
*/
Expand Down
14 changes: 8 additions & 6 deletions system/Database/Postgre/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
namespace CodeIgniter\Database\Postgre;

use CodeIgniter\Database\BaseBuilder;
use CodeIgniter\Database\BaseResult;
use CodeIgniter\Database\Exceptions\DatabaseException;
use CodeIgniter\Database\Query;
use CodeIgniter\Database\RawSql;
use CodeIgniter\Exceptions\InvalidArgumentException;

Expand Down Expand Up @@ -64,7 +66,7 @@ protected function compileIgnore(string $statement)
*
* @param string $direction ASC, DESC or RANDOM
*
* @return BaseBuilder
* @return $this
*/
public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
{
Expand All @@ -89,7 +91,7 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
/**
* Increments a numeric column by the specified value.
*
* @return mixed
* @return bool
*
* @throws DatabaseException
*/
Expand All @@ -111,7 +113,7 @@ public function increment(string $column, int $value = 1)
/**
* Decrements a numeric column by the specified value.
*
* @return mixed
* @return bool
*
* @throws DatabaseException
*/
Expand All @@ -138,7 +140,7 @@ public function decrement(string $column, int $value = 1)
*
* @param array|null $set An associative array of insert values
*
* @return mixed
* @return BaseResult|false|Query|string
*
* @throws DatabaseException
*/
Expand Down Expand Up @@ -225,7 +227,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
*
* @param mixed $where
*
* @return mixed
* @return bool|string
*
* @throws DatabaseException
*/
Expand Down Expand Up @@ -303,7 +305,7 @@ protected function _like_statement(?string $prefix, string $column, ?string $not
*
* @param RawSql|string $cond
*
* @return BaseBuilder
* @return $this
*/
public function join(string $table, $cond, string $type = '', ?bool $escape = null)
{
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 @@ -469,7 +469,7 @@ protected function _enableForeignKeyChecks()
* Must return this format: ['code' => string|int, 'message' => string]
* intval(code) === 0 means "no error".
*
* @return array<string, int|string>
* @return array{code: int|string|null, message: string|null}
*/
public function error(): array
{
Expand Down
8 changes: 5 additions & 3 deletions system/Database/SQLSRV/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
namespace CodeIgniter\Database\SQLSRV;

use CodeIgniter\Database\BaseBuilder;
use CodeIgniter\Database\BaseResult;
use CodeIgniter\Database\Exceptions\DatabaseException;
use CodeIgniter\Database\Exceptions\DataException;
use CodeIgniter\Database\Query;
use CodeIgniter\Database\RawSql;
use CodeIgniter\Database\ResultInterface;
use Config\Feature;
Expand Down Expand Up @@ -358,7 +360,7 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
/**
* Compiles a replace into string and runs the query
*
* @return mixed
* @return BaseResult|false|Query|string
*
* @throws DatabaseException
*/
Expand Down Expand Up @@ -462,7 +464,7 @@ protected function _replace(string $table, array $keys, array $values): string
*
* Handle float return value
*
* @return BaseBuilder
* @return $this
*/
protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
{
Expand Down Expand Up @@ -538,7 +540,7 @@ protected function _delete(string $table): string
*
* @param mixed $where
*
* @return mixed
* @return bool|string
*
* @throws DatabaseException
*/
Expand Down
2 changes: 1 addition & 1 deletion system/Database/SQLSRV/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ protected function _transRollback(): bool
* Must return this format: ['code' => string|int, 'message' => string]
* intval(code) === 0 means "no error".
*
* @return array<string, int|string>
* @return array{code: int|string|null, message: string|null}
*/
public function error(): array
{
Expand Down
2 changes: 1 addition & 1 deletion system/Database/SQLite3/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ protected function _enableForeignKeyChecks()
* Must return this format: ['code' => string|int, 'message' => string]
* intval(code) === 0 means "no error".
*
* @return array<string, int|string>
* @return array{code: int|string|null, message: string|null}
*/
public function error(): array
{
Expand Down
8 changes: 4 additions & 4 deletions system/HTTP/DownloadResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public function setStatusCode(int $code, string $reason = '')
* Sets the Content Type header for this response with the mime type
* and, optionally, the charset.
*
* @return ResponseInterface
* @return $this
*/
public function setContentType(string $mime, string $charset = 'UTF-8')
{
Expand Down Expand Up @@ -286,7 +286,7 @@ public function buildHeaders()
/**
* output download file text.
*
* @return DownloadResponse
* @return $this
*
* @throws DownloadException
*/
Expand All @@ -306,7 +306,7 @@ public function sendBody()
/**
* output download text by file.
*
* @return DownloadResponse
* @return $this
*/
private function sendBodyByFilePath()
{
Expand All @@ -324,7 +324,7 @@ private function sendBodyByFilePath()
/**
* output download text by binary
*
* @return DownloadResponse
* @return $this
*/
private function sendBodyByBinary()
{
Expand Down
10 changes: 5 additions & 5 deletions system/HTTP/Exceptions/HTTPException.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class HTTPException extends FrameworkException implements ExceptionInterface
/**
* For CurlRequest
*
* @return HTTPException
* @return static
*
* @codeCoverageIgnore
*/
Expand All @@ -35,7 +35,7 @@ public static function forMissingCurl()
/**
* For CurlRequest
*
* @return HTTPException
* @return static
*/
public static function forSSLCertNotFound(string $cert)
{
Expand All @@ -45,7 +45,7 @@ public static function forSSLCertNotFound(string $cert)
/**
* For CurlRequest
*
* @return HTTPException
* @return static
*/
public static function forInvalidSSLKey(string $key)
{
Expand Down Expand Up @@ -190,7 +190,7 @@ public static function forMalformedQueryString()
/**
* For Uploaded file move
*
* @return HTTPException
* @return static
*/
public static function forAlreadyMoved()
{
Expand All @@ -200,7 +200,7 @@ public static function forAlreadyMoved()
/**
* For Uploaded file move
*
* @return HTTPException
* @return static
*/
public static function forInvalidFile(?string $path = null)
{
Expand Down
4 changes: 2 additions & 2 deletions system/Images/Handlers/BaseHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function withResource()
*
* @param bool $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
*
* @return BaseHandler
* @return $this
*/
public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto')
{
Expand Down Expand Up @@ -536,7 +536,7 @@ public function getEXIF(?string $key = null, bool $silent = false)
* - bottom
* - bottom-right
*
* @return BaseHandler
* @return $this
*/
public function fit(int $width, ?int $height = null, string $position = 'center')
{
Expand Down
2 changes: 1 addition & 1 deletion system/Images/Handlers/ImageMagickHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protected function process(string $action, int $quality = 100)
/**
* Handles the actual resizing of the image.
*
* @return ImageMagickHandler
* @return $this
*
* @throws ImagickException
*/
Expand Down
2 changes: 1 addition & 1 deletion utils/phpstan-baseline/loader.neon
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# total 2055 errors
# total 2029 errors

includes:
- argument.type.neon
Expand Down
Loading
Loading