refactor: fix missingType.return errors in system files#9530

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.

Sign up for GitHub

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
paulbalandan merged 1 commit into from
Apr 19, 2025
Merged

refactor: fix missingType.return errors in system files #9530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion system/CodeIgniter.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
$this->response->setStatusCode($e->getCode());

// Is there a 404 Override available?
if ($override = $this->router->get404Override()) {
$override = $this->router->get404Override();

if ($override !== null) {
$returned = null;

if ($override instanceof Closure) {
Expand Down
2 changes: 1 addition & 1 deletion system/ComposerScripts.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
* This static method is called by Composer after every update event,
* i.e., `composer install`, `composer update`, `composer remove`.
*/
public static function postUpdate()
public static function postUpdate(): void
{
self::recursiveDelete(self::$path);

Expand Down
6 changes: 6 additions & 0 deletions system/Database/BaseBuilder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
* Resets the query builder values. Called by the get() function
*
* @param array $qbResetItems An array of fields to reset
*
* @return void
*/
protected function resetRun(array $qbResetItems)
{
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

/**
* Resets the query builder values. Called by the get() function
*
* @return void
*/
protected function resetSelect()
{
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
* Resets the query builder "write" values.
*
* Called by the insert() update() insertBatch() updateBatch() and delete() functions
*
* @return void
*/
protected function resetWrite()
{
Expand Down
4 changes: 2 additions & 2 deletions system/Database/Config.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
* Class Config
*
* @see \CodeIgniter\Database\ConfigTest
*/
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

/**
* Ensures the database Connection Manager/Factory is loaded and ready to use.
*
* @return void
*/
protected static function ensureFactory()
{
Expand Down
12 changes: 12 additions & 0 deletions system/Database/Exceptions/DataException.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
return new static(lang('Database.invalidArgument', [$argument]));
}

/**
* @return DataException
*/
public static function forInvalidAllowedFields(string $model)
{
return new static(lang('Database.invalidAllowedFields', [$model]));
}

/**
* @return DataException
*/
public static function forTableNotFound(string $table)
{
return new static(lang('Database.tableNotFound', [$table]));
}

/**
* @return DataException
*/
public static function forEmptyInputGiven(string $argument)
{
return new static(lang('Database.forEmptyInputGiven', [$argument]));
}

/**
* @return DataException
*/
public static function forFindColumnHaveMultipleColumns()
{
return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down
15 changes: 15 additions & 0 deletions system/Database/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

/**
* Performs a data type mapping between different databases.
*
* @return void
*/
protected function _attributeType(array &$attributes)
{
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
* if $attributes['TYPE'] is found in the array
* - array(TYPE => UTYPE) will change $field['type'],
* from TYPE to UTYPE in case of a match
*
* @return void
*/
protected function _attributeUnsigned(array &$attributes, array &$field)
{
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
$field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
}

/**
* @return void
*/
protected function _attributeDefault(array &$attributes, array &$field)
{
if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
}
}

/**
* @return void
*/
protected function _attributeUnique(array &$attributes, array &$field)
{
if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
$field['unique'] = ' UNIQUE';
}
}

/**
* @return void
*/
protected function _attributeAutoIncrement(array &$attributes, array &$field)
{
if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

/**
* Resets table creation vars
*
* @return void
*/
public function reset()
{
Expand Down
4 changes: 4 additions & 0 deletions system/Database/Migration.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

/**
* Perform a migration step.
*
* @return void
*/
abstract public function up();

/**
* Revert a migration step.
*
* @return void
*/
abstract public function down();
}
10 changes: 10 additions & 0 deletions system/Database/MigrationRunner.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
*
* @param string $path Full path to a valid migration file
* @param string $path Namespace of the target migration
*
* @return bool
*/
public function force(string $path, string $namespace, ?string $group = null)
{
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

/**
* Truncates the history table.
*
* @return void
*/
public function clearHistory()
{
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
* Add a history to the table.
*
* @param object $migration
*
* @return void
*/
protected function addHistory($migration, int $batch)
{
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
* Removes a single history
*
* @param object $history
*
* @return void
*/
protected function removeHistory($history)
{
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
/**
* Ensures that we have created our migrations table
* in the database.
*
* @return void
*/
public function ensureTable()
{
Expand Down
2 changes: 2 additions & 0 deletions system/Database/Postgre/Connection.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

/**
* Build a DSN from the provided parameters
*
* @return void
*/
protected function buildDSN()
{
Expand Down
2 changes: 2 additions & 0 deletions system/Database/Query.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
* Escapes and inserts any binds into the finalQueryString property.
*
* @see https://regex101.com/r/EUEhay/5
*
* @return void
*/
protected function compileBinds()
{
Expand Down
10 changes: 6 additions & 4 deletions system/Database/QueryInterface.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
*
* @param mixed $binds
*
* @return mixed
* @return $this
*/
public function setQuery(string $sql, $binds = null, bool $setEscape = true);

/**
* Returns the final, processed query string after binding, etal
* has been performed.
*
* @return mixed
* @return string
*/
public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
* for it's start and end values. If no end value is present, will
* use the current time to determine total duration.
*
* @return mixed
* @return $this
*/
public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

/**
* Stores the error description that happened for this query.
*
* @return $this
*/
public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
/**
* Swaps out one table prefix for a new one.
*
* @return mixed
* @return $this
*/
public function swapPrefix(string $orig, string $swap);
}
2 changes: 2 additions & 0 deletions system/Database/ResultInterface.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

/**
* Frees the current result.
*
* @return void
*/
public function freeResult();

Expand Down
6 changes: 4 additions & 2 deletions system/Database/SQLite3/Table.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
* Class Table
*
* Provides missing features for altering tables that are common
* in other supported databases, but are missing from SQLite.
* These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
* Copies data from our old table to the new one,
* taking care map data correctly based on any columns
* that have been renamed.
*
* @return void
*/
protected function copyData()
{
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
/**
* Attempts to drop all indexes and constraints
* from the database for this table.
*
* @return void
*/
protected function dropIndexes()
{
Expand Down
2 changes: 2 additions & 0 deletions system/Database/Seeder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
/**
* Loads the specified seeder and runs it.
*
* @return void
*
* @throws InvalidArgumentException
*/
public function call(string $class)
Expand Down
2 changes: 2 additions & 0 deletions system/Router/Router.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
/**
* Returns the 404 Override settings from the Collection.
* If the override is a string, will split to controller/index array.
*
* @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
*/
public function get404Override()
{
Expand Down
17 changes: 17 additions & 0 deletions system/Session/Exceptions/SessionException.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
/**
* @return static
*/
public static function forMissingDatabaseTable()
{
return new static(lang('Session.missingDatabaseTable'));
}

/**
* @return static
*/
public static function forInvalidSavePath(?string $path = null)
{
return new static(lang('Session.invalidSavePath', [$path]));
}

/**
* @return static
*/
public static function forWriteProtectedSavePath(?string $path = null)
{
return new static(lang('Session.writeProtectedSavePath', [$path]));
}

/**
* @return static
*/
public static function forEmptySavepath()
{
return new static(lang('Session.emptySavePath'));
}

/**
* @return static
*/
public static function forInvalidSavePathFormat(string $path)
{
return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
/**
* @deprecated
*
* @return static
*
* @codeCoverageIgnore
*/
public static function forInvalidSameSiteSetting(string $samesite)
Expand Down
2 changes: 2 additions & 0 deletions system/Session/Handlers/Database/PostgreHandler.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
/**
* Sets SELECT clause
*
* @return void
*/
protected function setSelect(BaseBuilder $builder)
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor: fix missingType.return errors in system files#9530

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.

 Sign up for GitHub

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

paulbalandan
merged 1 commit into

from

Apr 19, 2025
 Merged


refactor: fix missingType.return errors in system files
#9530
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
 $this->response->setStatusCode($e->getCode());

 // Is there a 404 Override available?
 if ($override = $this->router->get404Override()) {
 $override = $this->router->get404Override();

 if ($override !== null) {
 $returned = null;

 if ($override instanceof Closure) {
Expand Down

2 changes: 1 addition & 1 deletion
system/ComposerScripts.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
 * This static method is called by Composer after every update event,
 * i.e., `composer install`, `composer update`, `composer remove`.
 */
 public static function postUpdate()
 public static function postUpdate(): void
 {
 self::recursiveDelete(self::$path);

Expand Down

6 changes: 6 additions & 0 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
 * Resets the query builder values. Called by the get() function
 *
 * @param array $qbResetItems An array of fields to reset
 *
 * @return void
 */
 protected function resetRun(array $qbResetItems)
 {
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

 /**
 * Resets the query builder values. Called by the get() function
 *
 * @return void
 */
 protected function resetSelect()
 {
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
 * Resets the query builder "write" values.
 *
 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
 *
 * @return void
 */
 protected function resetWrite()
 {
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
 * Class Config
 *
 * @see \CodeIgniter\Database\ConfigTest
 */
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

 /**
 * Ensures the database Connection Manager/Factory is loaded and ready to use.
 *
 * @return void
 */
 protected static function ensureFactory()
 {
Expand Down

12 changes: 12 additions & 0 deletions
system/Database/Exceptions/DataException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
 return new static(lang('Database.invalidArgument', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forInvalidAllowedFields(string $model)
 {
 return new static(lang('Database.invalidAllowedFields', [$model]));
 }

 /**
 * @return DataException
 */
 public static function forTableNotFound(string $table)
 {
 return new static(lang('Database.tableNotFound', [$table]));
 }

 /**
 * @return DataException
 */
 public static function forEmptyInputGiven(string $argument)
 {
 return new static(lang('Database.forEmptyInputGiven', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forFindColumnHaveMultipleColumns()
 {
 return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down

15 changes: 15 additions & 0 deletions
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

 /**
 * Performs a data type mapping between different databases.
 *
 * @return void
 */
 protected function _attributeType(array &$attributes)
 {
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
 * if $attributes['TYPE'] is found in the array
 * - array(TYPE => UTYPE) will change $field['type'],
 * from TYPE to UTYPE in case of a match
 *
 * @return void
 */
 protected function _attributeUnsigned(array &$attributes, array &$field)
 {
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
 $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
 }

 /**
 * @return void
 */
 protected function _attributeDefault(array &$attributes, array &$field)
 {
 if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
 }
 }

 /**
 * @return void
 */
 protected function _attributeUnique(array &$attributes, array &$field)
 {
 if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
 $field['unique'] = ' UNIQUE';
 }
 }

 /**
 * @return void
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

 /**
 * Resets table creation vars
 *
 * @return void
 */
 public function reset()
 {
Expand Down

4 changes: 4 additions & 0 deletions
system/Database/Migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

 /**
 * Perform a migration step.
 *
 * @return void
 */
 abstract public function up();

 /**
 * Revert a migration step.
 *
 * @return void
 */
 abstract public function down();
}

10 changes: 10 additions & 0 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 *
 * @param string $path Full path to a valid migration file
 * @param string $path Namespace of the target migration
 *
 * @return bool
 */
 public function force(string $path, string $namespace, ?string $group = null)
 {
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

 /**
 * Truncates the history table.
 *
 * @return void
 */
 public function clearHistory()
 {
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
 * Add a history to the table.
 *
 * @param object $migration
 *
 * @return void
 */
 protected function addHistory($migration, int $batch)
 {
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
 * Removes a single history
 *
 * @param object $history
 *
 * @return void
 */
 protected function removeHistory($history)
 {
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
 /**
 * Ensures that we have created our migrations table
 * in the database.
 *
 * @return void
 */
 public function ensureTable()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

 /**
 * Build a DSN from the provided parameters
 *
 * @return void
 */
 protected function buildDSN()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
 * Escapes and inserts any binds into the finalQueryString property.
 *
 * @see https://regex101.com/r/EUEhay/5
 *
 * @return void
 */
 protected function compileBinds()
 {
Expand Down

10 changes: 6 additions & 4 deletions
system/Database/QueryInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
 *
 * @param mixed $binds
 *
 * @return mixed
 * @return $this
 */
 public function setQuery(string $sql, $binds = null, bool $setEscape = true);

 /**
 * Returns the final, processed query string after binding, etal
 * has been performed.
 *
 * @return mixed
 * @return string
 */
 public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
 * for it's start and end values. If no end value is present, will
 * use the current time to determine total duration.
 *
 * @return mixed
 * @return $this
 */
 public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

 /**
 * Stores the error description that happened for this query.
 *
 * @return $this
 */
 public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
 /**
 * Swaps out one table prefix for a new one.
 *
 * @return mixed
 * @return $this
 */
 public function swapPrefix(string $orig, string $swap);
}

2 changes: 2 additions & 0 deletions
system/Database/ResultInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

 /**
 * Frees the current result.
 *
 * @return void
 */
 public function freeResult();

Expand Down

6 changes: 4 additions & 2 deletions
system/Database/SQLite3/Table.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
 * Class Table
 *
 * Provides missing features for altering tables that are common
 * in other supported databases, but are missing from SQLite.
 * These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
 * Copies data from our old table to the new one,
 * taking care map data correctly based on any columns
 * that have been renamed.
 *
 * @return void
 */
 protected function copyData()
 {
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
 /**
 * Attempts to drop all indexes and constraints
 * from the database for this table.
 *
 * @return void
 */
 protected function dropIndexes()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Seeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
 /**
 * Loads the specified seeder and runs it.
 *
 * @return void
 *
 * @throws InvalidArgumentException
 */
 public function call(string $class)
Expand Down

2 changes: 2 additions & 0 deletions
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
 /**
 * Returns the 404 Override settings from the Collection.
 * If the override is a string, will split to controller/index array.
 *
 * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
 */
 public function get404Override()
 {
Expand Down

17 changes: 17 additions & 0 deletions
system/Session/Exceptions/SessionException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
 /**
 * @return static
 */
 public static function forMissingDatabaseTable()
 {
 return new static(lang('Session.missingDatabaseTable'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePath(?string $path = null)
 {
 return new static(lang('Session.invalidSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forWriteProtectedSavePath(?string $path = null)
 {
 return new static(lang('Session.writeProtectedSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forEmptySavepath()
 {
 return new static(lang('Session.emptySavePath'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePathFormat(string $path)
 {
 return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
 /**
 * @deprecated
 *
 * @return static
 *
 * @codeCoverageIgnore
 */
 public static function forInvalidSameSiteSetting(string $samesite)
Expand Down

2 changes: 2 additions & 0 deletions
system/Session/Handlers/Database/PostgreHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
 /**
 * Sets SELECT clause
 *
 * @return void
 */
 protected function setSelect(BaseBuilder $builder)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: fix missingType.return errors in system files#9530

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.

 Sign up for GitHub

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

paulbalandan
merged 1 commit into

from

Apr 19, 2025
 Merged


refactor: fix missingType.return errors in system files
#9530
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
 $this->response->setStatusCode($e->getCode());

 // Is there a 404 Override available?
 if ($override = $this->router->get404Override()) {
 $override = $this->router->get404Override();

 if ($override !== null) {
 $returned = null;

 if ($override instanceof Closure) {
Expand Down

2 changes: 1 addition & 1 deletion
system/ComposerScripts.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
 * This static method is called by Composer after every update event,
 * i.e., `composer install`, `composer update`, `composer remove`.
 */
 public static function postUpdate()
 public static function postUpdate(): void
 {
 self::recursiveDelete(self::$path);

Expand Down

6 changes: 6 additions & 0 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
 * Resets the query builder values. Called by the get() function
 *
 * @param array $qbResetItems An array of fields to reset
 *
 * @return void
 */
 protected function resetRun(array $qbResetItems)
 {
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

 /**
 * Resets the query builder values. Called by the get() function
 *
 * @return void
 */
 protected function resetSelect()
 {
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
 * Resets the query builder "write" values.
 *
 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
 *
 * @return void
 */
 protected function resetWrite()
 {
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
 * Class Config
 *
 * @see \CodeIgniter\Database\ConfigTest
 */
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

 /**
 * Ensures the database Connection Manager/Factory is loaded and ready to use.
 *
 * @return void
 */
 protected static function ensureFactory()
 {
Expand Down

12 changes: 12 additions & 0 deletions
system/Database/Exceptions/DataException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
 return new static(lang('Database.invalidArgument', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forInvalidAllowedFields(string $model)
 {
 return new static(lang('Database.invalidAllowedFields', [$model]));
 }

 /**
 * @return DataException
 */
 public static function forTableNotFound(string $table)
 {
 return new static(lang('Database.tableNotFound', [$table]));
 }

 /**
 * @return DataException
 */
 public static function forEmptyInputGiven(string $argument)
 {
 return new static(lang('Database.forEmptyInputGiven', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forFindColumnHaveMultipleColumns()
 {
 return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down

15 changes: 15 additions & 0 deletions
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

 /**
 * Performs a data type mapping between different databases.
 *
 * @return void
 */
 protected function _attributeType(array &$attributes)
 {
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
 * if $attributes['TYPE'] is found in the array
 * - array(TYPE => UTYPE) will change $field['type'],
 * from TYPE to UTYPE in case of a match
 *
 * @return void
 */
 protected function _attributeUnsigned(array &$attributes, array &$field)
 {
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
 $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
 }

 /**
 * @return void
 */
 protected function _attributeDefault(array &$attributes, array &$field)
 {
 if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
 }
 }

 /**
 * @return void
 */
 protected function _attributeUnique(array &$attributes, array &$field)
 {
 if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
 $field['unique'] = ' UNIQUE';
 }
 }

 /**
 * @return void
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

 /**
 * Resets table creation vars
 *
 * @return void
 */
 public function reset()
 {
Expand Down

4 changes: 4 additions & 0 deletions
system/Database/Migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

 /**
 * Perform a migration step.
 *
 * @return void
 */
 abstract public function up();

 /**
 * Revert a migration step.
 *
 * @return void
 */
 abstract public function down();
}

10 changes: 10 additions & 0 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 *
 * @param string $path Full path to a valid migration file
 * @param string $path Namespace of the target migration
 *
 * @return bool
 */
 public function force(string $path, string $namespace, ?string $group = null)
 {
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

 /**
 * Truncates the history table.
 *
 * @return void
 */
 public function clearHistory()
 {
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
 * Add a history to the table.
 *
 * @param object $migration
 *
 * @return void
 */
 protected function addHistory($migration, int $batch)
 {
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
 * Removes a single history
 *
 * @param object $history
 *
 * @return void
 */
 protected function removeHistory($history)
 {
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
 /**
 * Ensures that we have created our migrations table
 * in the database.
 *
 * @return void
 */
 public function ensureTable()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

 /**
 * Build a DSN from the provided parameters
 *
 * @return void
 */
 protected function buildDSN()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
 * Escapes and inserts any binds into the finalQueryString property.
 *
 * @see https://regex101.com/r/EUEhay/5
 *
 * @return void
 */
 protected function compileBinds()
 {
Expand Down

10 changes: 6 additions & 4 deletions
system/Database/QueryInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
 *
 * @param mixed $binds
 *
 * @return mixed
 * @return $this
 */
 public function setQuery(string $sql, $binds = null, bool $setEscape = true);

 /**
 * Returns the final, processed query string after binding, etal
 * has been performed.
 *
 * @return mixed
 * @return string
 */
 public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
 * for it's start and end values. If no end value is present, will
 * use the current time to determine total duration.
 *
 * @return mixed
 * @return $this
 */
 public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

 /**
 * Stores the error description that happened for this query.
 *
 * @return $this
 */
 public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
 /**
 * Swaps out one table prefix for a new one.
 *
 * @return mixed
 * @return $this
 */
 public function swapPrefix(string $orig, string $swap);
}

2 changes: 2 additions & 0 deletions
system/Database/ResultInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

 /**
 * Frees the current result.
 *
 * @return void
 */
 public function freeResult();

Expand Down

6 changes: 4 additions & 2 deletions
system/Database/SQLite3/Table.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
 * Class Table
 *
 * Provides missing features for altering tables that are common
 * in other supported databases, but are missing from SQLite.
 * These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
 * Copies data from our old table to the new one,
 * taking care map data correctly based on any columns
 * that have been renamed.
 *
 * @return void
 */
 protected function copyData()
 {
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
 /**
 * Attempts to drop all indexes and constraints
 * from the database for this table.
 *
 * @return void
 */
 protected function dropIndexes()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Seeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
 /**
 * Loads the specified seeder and runs it.
 *
 * @return void
 *
 * @throws InvalidArgumentException
 */
 public function call(string $class)
Expand Down

2 changes: 2 additions & 0 deletions
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
 /**
 * Returns the 404 Override settings from the Collection.
 * If the override is a string, will split to controller/index array.
 *
 * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
 */
 public function get404Override()
 {
Expand Down

17 changes: 17 additions & 0 deletions
system/Session/Exceptions/SessionException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
 /**
 * @return static
 */
 public static function forMissingDatabaseTable()
 {
 return new static(lang('Session.missingDatabaseTable'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePath(?string $path = null)
 {
 return new static(lang('Session.invalidSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forWriteProtectedSavePath(?string $path = null)
 {
 return new static(lang('Session.writeProtectedSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forEmptySavepath()
 {
 return new static(lang('Session.emptySavePath'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePathFormat(string $path)
 {
 return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
 /**
 * @deprecated
 *
 * @return static
 *
 * @codeCoverageIgnore
 */
 public static function forInvalidSameSiteSetting(string $samesite)
Expand Down

2 changes: 2 additions & 0 deletions
system/Session/Handlers/Database/PostgreHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
 /**
 * Sets SELECT clause
 *
 * @return void
 */
 protected function setSelect(BaseBuilder $builder)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: fix missingType.return errors in system files#9530

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.

 Sign up for GitHub

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

paulbalandan
merged 1 commit into

from

Apr 19, 2025
 Merged


refactor: fix missingType.return errors in system files
#9530
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
 $this->response->setStatusCode($e->getCode());

 // Is there a 404 Override available?
 if ($override = $this->router->get404Override()) {
 $override = $this->router->get404Override();

 if ($override !== null) {
 $returned = null;

 if ($override instanceof Closure) {
Expand Down

2 changes: 1 addition & 1 deletion
system/ComposerScripts.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
 * This static method is called by Composer after every update event,
 * i.e., `composer install`, `composer update`, `composer remove`.
 */
 public static function postUpdate()
 public static function postUpdate(): void
 {
 self::recursiveDelete(self::$path);

Expand Down

6 changes: 6 additions & 0 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
 * Resets the query builder values. Called by the get() function
 *
 * @param array $qbResetItems An array of fields to reset
 *
 * @return void
 */
 protected function resetRun(array $qbResetItems)
 {
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

 /**
 * Resets the query builder values. Called by the get() function
 *
 * @return void
 */
 protected function resetSelect()
 {
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
 * Resets the query builder "write" values.
 *
 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
 *
 * @return void
 */
 protected function resetWrite()
 {
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
 * Class Config
 *
 * @see \CodeIgniter\Database\ConfigTest
 */
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

 /**
 * Ensures the database Connection Manager/Factory is loaded and ready to use.
 *
 * @return void
 */
 protected static function ensureFactory()
 {
Expand Down

12 changes: 12 additions & 0 deletions
system/Database/Exceptions/DataException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
 return new static(lang('Database.invalidArgument', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forInvalidAllowedFields(string $model)
 {
 return new static(lang('Database.invalidAllowedFields', [$model]));
 }

 /**
 * @return DataException
 */
 public static function forTableNotFound(string $table)
 {
 return new static(lang('Database.tableNotFound', [$table]));
 }

 /**
 * @return DataException
 */
 public static function forEmptyInputGiven(string $argument)
 {
 return new static(lang('Database.forEmptyInputGiven', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forFindColumnHaveMultipleColumns()
 {
 return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down

15 changes: 15 additions & 0 deletions
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

 /**
 * Performs a data type mapping between different databases.
 *
 * @return void
 */
 protected function _attributeType(array &$attributes)
 {
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
 * if $attributes['TYPE'] is found in the array
 * - array(TYPE => UTYPE) will change $field['type'],
 * from TYPE to UTYPE in case of a match
 *
 * @return void
 */
 protected function _attributeUnsigned(array &$attributes, array &$field)
 {
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
 $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
 }

 /**
 * @return void
 */
 protected function _attributeDefault(array &$attributes, array &$field)
 {
 if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
 }
 }

 /**
 * @return void
 */
 protected function _attributeUnique(array &$attributes, array &$field)
 {
 if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
 $field['unique'] = ' UNIQUE';
 }
 }

 /**
 * @return void
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

 /**
 * Resets table creation vars
 *
 * @return void
 */
 public function reset()
 {
Expand Down

4 changes: 4 additions & 0 deletions
system/Database/Migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

 /**
 * Perform a migration step.
 *
 * @return void
 */
 abstract public function up();

 /**
 * Revert a migration step.
 *
 * @return void
 */
 abstract public function down();
}

10 changes: 10 additions & 0 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 *
 * @param string $path Full path to a valid migration file
 * @param string $path Namespace of the target migration
 *
 * @return bool
 */
 public function force(string $path, string $namespace, ?string $group = null)
 {
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

 /**
 * Truncates the history table.
 *
 * @return void
 */
 public function clearHistory()
 {
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
 * Add a history to the table.
 *
 * @param object $migration
 *
 * @return void
 */
 protected function addHistory($migration, int $batch)
 {
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
 * Removes a single history
 *
 * @param object $history
 *
 * @return void
 */
 protected function removeHistory($history)
 {
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
 /**
 * Ensures that we have created our migrations table
 * in the database.
 *
 * @return void
 */
 public function ensureTable()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

 /**
 * Build a DSN from the provided parameters
 *
 * @return void
 */
 protected function buildDSN()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
 * Escapes and inserts any binds into the finalQueryString property.
 *
 * @see https://regex101.com/r/EUEhay/5
 *
 * @return void
 */
 protected function compileBinds()
 {
Expand Down

10 changes: 6 additions & 4 deletions
system/Database/QueryInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
 *
 * @param mixed $binds
 *
 * @return mixed
 * @return $this
 */
 public function setQuery(string $sql, $binds = null, bool $setEscape = true);

 /**
 * Returns the final, processed query string after binding, etal
 * has been performed.
 *
 * @return mixed
 * @return string
 */
 public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
 * for it's start and end values. If no end value is present, will
 * use the current time to determine total duration.
 *
 * @return mixed
 * @return $this
 */
 public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

 /**
 * Stores the error description that happened for this query.
 *
 * @return $this
 */
 public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
 /**
 * Swaps out one table prefix for a new one.
 *
 * @return mixed
 * @return $this
 */
 public function swapPrefix(string $orig, string $swap);
}

2 changes: 2 additions & 0 deletions
system/Database/ResultInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

 /**
 * Frees the current result.
 *
 * @return void
 */
 public function freeResult();

Expand Down

6 changes: 4 additions & 2 deletions
system/Database/SQLite3/Table.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
 * Class Table
 *
 * Provides missing features for altering tables that are common
 * in other supported databases, but are missing from SQLite.
 * These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
 * Copies data from our old table to the new one,
 * taking care map data correctly based on any columns
 * that have been renamed.
 *
 * @return void
 */
 protected function copyData()
 {
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
 /**
 * Attempts to drop all indexes and constraints
 * from the database for this table.
 *
 * @return void
 */
 protected function dropIndexes()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Seeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
 /**
 * Loads the specified seeder and runs it.
 *
 * @return void
 *
 * @throws InvalidArgumentException
 */
 public function call(string $class)
Expand Down

2 changes: 2 additions & 0 deletions
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
 /**
 * Returns the 404 Override settings from the Collection.
 * If the override is a string, will split to controller/index array.
 *
 * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
 */
 public function get404Override()
 {
Expand Down

17 changes: 17 additions & 0 deletions
system/Session/Exceptions/SessionException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
 /**
 * @return static
 */
 public static function forMissingDatabaseTable()
 {
 return new static(lang('Session.missingDatabaseTable'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePath(?string $path = null)
 {
 return new static(lang('Session.invalidSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forWriteProtectedSavePath(?string $path = null)
 {
 return new static(lang('Session.writeProtectedSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forEmptySavepath()
 {
 return new static(lang('Session.emptySavePath'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePathFormat(string $path)
 {
 return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
 /**
 * @deprecated
 *
 * @return static
 *
 * @codeCoverageIgnore
 */
 public static function forInvalidSameSiteSetting(string $samesite)
Expand Down

2 changes: 2 additions & 0 deletions
system/Session/Handlers/Database/PostgreHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
 /**
 * Sets SELECT clause
 *
 * @return void
 */
 protected function setSelect(BaseBuilder $builder)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor: fix missingType.return errors in system files#9530

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.

 Sign up for GitHub

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

paulbalandan
merged 1 commit into

from

Apr 19, 2025
 Merged


refactor: fix missingType.return errors in system files
#9530
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
 $this->response->setStatusCode($e->getCode());

 // Is there a 404 Override available?
 if ($override = $this->router->get404Override()) {
 $override = $this->router->get404Override();

 if ($override !== null) {
 $returned = null;

 if ($override instanceof Closure) {
Expand Down

2 changes: 1 addition & 1 deletion
system/ComposerScripts.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
 * This static method is called by Composer after every update event,
 * i.e., `composer install`, `composer update`, `composer remove`.
 */
 public static function postUpdate()
 public static function postUpdate(): void
 {
 self::recursiveDelete(self::$path);

Expand Down

6 changes: 6 additions & 0 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
 * Resets the query builder values. Called by the get() function
 *
 * @param array $qbResetItems An array of fields to reset
 *
 * @return void
 */
 protected function resetRun(array $qbResetItems)
 {
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

 /**
 * Resets the query builder values. Called by the get() function
 *
 * @return void
 */
 protected function resetSelect()
 {
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
 * Resets the query builder "write" values.
 *
 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
 *
 * @return void
 */
 protected function resetWrite()
 {
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
 * Class Config
 *
 * @see \CodeIgniter\Database\ConfigTest
 */
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

 /**
 * Ensures the database Connection Manager/Factory is loaded and ready to use.
 *
 * @return void
 */
 protected static function ensureFactory()
 {
Expand Down

12 changes: 12 additions & 0 deletions
system/Database/Exceptions/DataException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
 return new static(lang('Database.invalidArgument', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forInvalidAllowedFields(string $model)
 {
 return new static(lang('Database.invalidAllowedFields', [$model]));
 }

 /**
 * @return DataException
 */
 public static function forTableNotFound(string $table)
 {
 return new static(lang('Database.tableNotFound', [$table]));
 }

 /**
 * @return DataException
 */
 public static function forEmptyInputGiven(string $argument)
 {
 return new static(lang('Database.forEmptyInputGiven', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forFindColumnHaveMultipleColumns()
 {
 return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down

15 changes: 15 additions & 0 deletions
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

 /**
 * Performs a data type mapping between different databases.
 *
 * @return void
 */
 protected function _attributeType(array &$attributes)
 {
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
 * if $attributes['TYPE'] is found in the array
 * - array(TYPE => UTYPE) will change $field['type'],
 * from TYPE to UTYPE in case of a match
 *
 * @return void
 */
 protected function _attributeUnsigned(array &$attributes, array &$field)
 {
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
 $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
 }

 /**
 * @return void
 */
 protected function _attributeDefault(array &$attributes, array &$field)
 {
 if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
 }
 }

 /**
 * @return void
 */
 protected function _attributeUnique(array &$attributes, array &$field)
 {
 if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
 $field['unique'] = ' UNIQUE';
 }
 }

 /**
 * @return void
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

 /**
 * Resets table creation vars
 *
 * @return void
 */
 public function reset()
 {
Expand Down

4 changes: 4 additions & 0 deletions
system/Database/Migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

 /**
 * Perform a migration step.
 *
 * @return void
 */
 abstract public function up();

 /**
 * Revert a migration step.
 *
 * @return void
 */
 abstract public function down();
}

10 changes: 10 additions & 0 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 *
 * @param string $path Full path to a valid migration file
 * @param string $path Namespace of the target migration
 *
 * @return bool
 */
 public function force(string $path, string $namespace, ?string $group = null)
 {
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

 /**
 * Truncates the history table.
 *
 * @return void
 */
 public function clearHistory()
 {
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
 * Add a history to the table.
 *
 * @param object $migration
 *
 * @return void
 */
 protected function addHistory($migration, int $batch)
 {
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
 * Removes a single history
 *
 * @param object $history
 *
 * @return void
 */
 protected function removeHistory($history)
 {
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
 /**
 * Ensures that we have created our migrations table
 * in the database.
 *
 * @return void
 */
 public function ensureTable()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

 /**
 * Build a DSN from the provided parameters
 *
 * @return void
 */
 protected function buildDSN()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
 * Escapes and inserts any binds into the finalQueryString property.
 *
 * @see https://regex101.com/r/EUEhay/5
 *
 * @return void
 */
 protected function compileBinds()
 {
Expand Down

10 changes: 6 additions & 4 deletions
system/Database/QueryInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
 *
 * @param mixed $binds
 *
 * @return mixed
 * @return $this
 */
 public function setQuery(string $sql, $binds = null, bool $setEscape = true);

 /**
 * Returns the final, processed query string after binding, etal
 * has been performed.
 *
 * @return mixed
 * @return string
 */
 public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
 * for it's start and end values. If no end value is present, will
 * use the current time to determine total duration.
 *
 * @return mixed
 * @return $this
 */
 public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

 /**
 * Stores the error description that happened for this query.
 *
 * @return $this
 */
 public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
 /**
 * Swaps out one table prefix for a new one.
 *
 * @return mixed
 * @return $this
 */
 public function swapPrefix(string $orig, string $swap);
}

2 changes: 2 additions & 0 deletions
system/Database/ResultInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

 /**
 * Frees the current result.
 *
 * @return void
 */
 public function freeResult();

Expand Down

6 changes: 4 additions & 2 deletions
system/Database/SQLite3/Table.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
 * Class Table
 *
 * Provides missing features for altering tables that are common
 * in other supported databases, but are missing from SQLite.
 * These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
 * Copies data from our old table to the new one,
 * taking care map data correctly based on any columns
 * that have been renamed.
 *
 * @return void
 */
 protected function copyData()
 {
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
 /**
 * Attempts to drop all indexes and constraints
 * from the database for this table.
 *
 * @return void
 */
 protected function dropIndexes()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Seeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
 /**
 * Loads the specified seeder and runs it.
 *
 * @return void
 *
 * @throws InvalidArgumentException
 */
 public function call(string $class)
Expand Down

2 changes: 2 additions & 0 deletions
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
 /**
 * Returns the 404 Override settings from the Collection.
 * If the override is a string, will split to controller/index array.
 *
 * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
 */
 public function get404Override()
 {
Expand Down

17 changes: 17 additions & 0 deletions
system/Session/Exceptions/SessionException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
 /**
 * @return static
 */
 public static function forMissingDatabaseTable()
 {
 return new static(lang('Session.missingDatabaseTable'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePath(?string $path = null)
 {
 return new static(lang('Session.invalidSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forWriteProtectedSavePath(?string $path = null)
 {
 return new static(lang('Session.writeProtectedSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forEmptySavepath()
 {
 return new static(lang('Session.emptySavePath'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePathFormat(string $path)
 {
 return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
 /**
 * @deprecated
 *
 * @return static
 *
 * @codeCoverageIgnore
 */
 public static function forInvalidSameSiteSetting(string $samesite)
Expand Down

2 changes: 2 additions & 0 deletions
system/Session/Handlers/Database/PostgreHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
 /**
 * Sets SELECT clause
 *
 * @return void
 */
 protected function setSelect(BaseBuilder $builder)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: fix missingType.return errors in system files#9530

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.

 Sign up for GitHub

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

paulbalandan
merged 1 commit into

from

Apr 19, 2025
 Merged


refactor: fix missingType.return errors in system files
#9530
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
 $this->response->setStatusCode($e->getCode());

 // Is there a 404 Override available?
 if ($override = $this->router->get404Override()) {
 $override = $this->router->get404Override();

 if ($override !== null) {
 $returned = null;

 if ($override instanceof Closure) {
Expand Down

2 changes: 1 addition & 1 deletion
system/ComposerScripts.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
 * This static method is called by Composer after every update event,
 * i.e., `composer install`, `composer update`, `composer remove`.
 */
 public static function postUpdate()
 public static function postUpdate(): void
 {
 self::recursiveDelete(self::$path);

Expand Down

6 changes: 6 additions & 0 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
 * Resets the query builder values. Called by the get() function
 *
 * @param array $qbResetItems An array of fields to reset
 *
 * @return void
 */
 protected function resetRun(array $qbResetItems)
 {
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

 /**
 * Resets the query builder values. Called by the get() function
 *
 * @return void
 */
 protected function resetSelect()
 {
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
 * Resets the query builder "write" values.
 *
 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
 *
 * @return void
 */
 protected function resetWrite()
 {
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
 * Class Config
 *
 * @see \CodeIgniter\Database\ConfigTest
 */
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

 /**
 * Ensures the database Connection Manager/Factory is loaded and ready to use.
 *
 * @return void
 */
 protected static function ensureFactory()
 {
Expand Down

12 changes: 12 additions & 0 deletions
system/Database/Exceptions/DataException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
 return new static(lang('Database.invalidArgument', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forInvalidAllowedFields(string $model)
 {
 return new static(lang('Database.invalidAllowedFields', [$model]));
 }

 /**
 * @return DataException
 */
 public static function forTableNotFound(string $table)
 {
 return new static(lang('Database.tableNotFound', [$table]));
 }

 /**
 * @return DataException
 */
 public static function forEmptyInputGiven(string $argument)
 {
 return new static(lang('Database.forEmptyInputGiven', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forFindColumnHaveMultipleColumns()
 {
 return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down

15 changes: 15 additions & 0 deletions
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

 /**
 * Performs a data type mapping between different databases.
 *
 * @return void
 */
 protected function _attributeType(array &$attributes)
 {
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
 * if $attributes['TYPE'] is found in the array
 * - array(TYPE => UTYPE) will change $field['type'],
 * from TYPE to UTYPE in case of a match
 *
 * @return void
 */
 protected function _attributeUnsigned(array &$attributes, array &$field)
 {
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
 $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
 }

 /**
 * @return void
 */
 protected function _attributeDefault(array &$attributes, array &$field)
 {
 if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
 }
 }

 /**
 * @return void
 */
 protected function _attributeUnique(array &$attributes, array &$field)
 {
 if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
 $field['unique'] = ' UNIQUE';
 }
 }

 /**
 * @return void
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

 /**
 * Resets table creation vars
 *
 * @return void
 */
 public function reset()
 {
Expand Down

4 changes: 4 additions & 0 deletions
system/Database/Migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

 /**
 * Perform a migration step.
 *
 * @return void
 */
 abstract public function up();

 /**
 * Revert a migration step.
 *
 * @return void
 */
 abstract public function down();
}

10 changes: 10 additions & 0 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 *
 * @param string $path Full path to a valid migration file
 * @param string $path Namespace of the target migration
 *
 * @return bool
 */
 public function force(string $path, string $namespace, ?string $group = null)
 {
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

 /**
 * Truncates the history table.
 *
 * @return void
 */
 public function clearHistory()
 {
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
 * Add a history to the table.
 *
 * @param object $migration
 *
 * @return void
 */
 protected function addHistory($migration, int $batch)
 {
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
 * Removes a single history
 *
 * @param object $history
 *
 * @return void
 */
 protected function removeHistory($history)
 {
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
 /**
 * Ensures that we have created our migrations table
 * in the database.
 *
 * @return void
 */
 public function ensureTable()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

 /**
 * Build a DSN from the provided parameters
 *
 * @return void
 */
 protected function buildDSN()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
 * Escapes and inserts any binds into the finalQueryString property.
 *
 * @see https://regex101.com/r/EUEhay/5
 *
 * @return void
 */
 protected function compileBinds()
 {
Expand Down

10 changes: 6 additions & 4 deletions
system/Database/QueryInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
 *
 * @param mixed $binds
 *
 * @return mixed
 * @return $this
 */
 public function setQuery(string $sql, $binds = null, bool $setEscape = true);

 /**
 * Returns the final, processed query string after binding, etal
 * has been performed.
 *
 * @return mixed
 * @return string
 */
 public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
 * for it's start and end values. If no end value is present, will
 * use the current time to determine total duration.
 *
 * @return mixed
 * @return $this
 */
 public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

 /**
 * Stores the error description that happened for this query.
 *
 * @return $this
 */
 public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
 /**
 * Swaps out one table prefix for a new one.
 *
 * @return mixed
 * @return $this
 */
 public function swapPrefix(string $orig, string $swap);
}

2 changes: 2 additions & 0 deletions
system/Database/ResultInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

 /**
 * Frees the current result.
 *
 * @return void
 */
 public function freeResult();

Expand Down

6 changes: 4 additions & 2 deletions
system/Database/SQLite3/Table.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
 * Class Table
 *
 * Provides missing features for altering tables that are common
 * in other supported databases, but are missing from SQLite.
 * These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
 * Copies data from our old table to the new one,
 * taking care map data correctly based on any columns
 * that have been renamed.
 *
 * @return void
 */
 protected function copyData()
 {
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
 /**
 * Attempts to drop all indexes and constraints
 * from the database for this table.
 *
 * @return void
 */
 protected function dropIndexes()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Seeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
 /**
 * Loads the specified seeder and runs it.
 *
 * @return void
 *
 * @throws InvalidArgumentException
 */
 public function call(string $class)
Expand Down

2 changes: 2 additions & 0 deletions
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
 /**
 * Returns the 404 Override settings from the Collection.
 * If the override is a string, will split to controller/index array.
 *
 * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
 */
 public function get404Override()
 {
Expand Down

17 changes: 17 additions & 0 deletions
system/Session/Exceptions/SessionException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
 /**
 * @return static
 */
 public static function forMissingDatabaseTable()
 {
 return new static(lang('Session.missingDatabaseTable'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePath(?string $path = null)
 {
 return new static(lang('Session.invalidSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forWriteProtectedSavePath(?string $path = null)
 {
 return new static(lang('Session.writeProtectedSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forEmptySavepath()
 {
 return new static(lang('Session.emptySavePath'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePathFormat(string $path)
 {
 return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
 /**
 * @deprecated
 *
 * @return static
 *
 * @codeCoverageIgnore
 */
 public static function forInvalidSameSiteSetting(string $samesite)
Expand Down

2 changes: 2 additions & 0 deletions
system/Session/Handlers/Database/PostgreHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
 /**
 * Sets SELECT clause
 *
 * @return void
 */
 protected function setSelect(BaseBuilder $builder)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: fix missingType.return errors in system files#9530

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.

 Sign up for GitHub

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

paulbalandan
merged 1 commit into

from

Apr 19, 2025
 Merged


refactor: fix missingType.return errors in system files
#9530
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
 $this->response->setStatusCode($e->getCode());

 // Is there a 404 Override available?
 if ($override = $this->router->get404Override()) {
 $override = $this->router->get404Override();

 if ($override !== null) {
 $returned = null;

 if ($override instanceof Closure) {
Expand Down

2 changes: 1 addition & 1 deletion
system/ComposerScripts.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
 * This static method is called by Composer after every update event,
 * i.e., `composer install`, `composer update`, `composer remove`.
 */
 public static function postUpdate()
 public static function postUpdate(): void
 {
 self::recursiveDelete(self::$path);

Expand Down

6 changes: 6 additions & 0 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
 * Resets the query builder values. Called by the get() function
 *
 * @param array $qbResetItems An array of fields to reset
 *
 * @return void
 */
 protected function resetRun(array $qbResetItems)
 {
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

 /**
 * Resets the query builder values. Called by the get() function
 *
 * @return void
 */
 protected function resetSelect()
 {
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
 * Resets the query builder "write" values.
 *
 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
 *
 * @return void
 */
 protected function resetWrite()
 {
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
 * Class Config
 *
 * @see \CodeIgniter\Database\ConfigTest
 */
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

 /**
 * Ensures the database Connection Manager/Factory is loaded and ready to use.
 *
 * @return void
 */
 protected static function ensureFactory()
 {
Expand Down

12 changes: 12 additions & 0 deletions
system/Database/Exceptions/DataException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
 return new static(lang('Database.invalidArgument', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forInvalidAllowedFields(string $model)
 {
 return new static(lang('Database.invalidAllowedFields', [$model]));
 }

 /**
 * @return DataException
 */
 public static function forTableNotFound(string $table)
 {
 return new static(lang('Database.tableNotFound', [$table]));
 }

 /**
 * @return DataException
 */
 public static function forEmptyInputGiven(string $argument)
 {
 return new static(lang('Database.forEmptyInputGiven', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forFindColumnHaveMultipleColumns()
 {
 return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down

15 changes: 15 additions & 0 deletions
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

 /**
 * Performs a data type mapping between different databases.
 *
 * @return void
 */
 protected function _attributeType(array &$attributes)
 {
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
 * if $attributes['TYPE'] is found in the array
 * - array(TYPE => UTYPE) will change $field['type'],
 * from TYPE to UTYPE in case of a match
 *
 * @return void
 */
 protected function _attributeUnsigned(array &$attributes, array &$field)
 {
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
 $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
 }

 /**
 * @return void
 */
 protected function _attributeDefault(array &$attributes, array &$field)
 {
 if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
 }
 }

 /**
 * @return void
 */
 protected function _attributeUnique(array &$attributes, array &$field)
 {
 if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
 $field['unique'] = ' UNIQUE';
 }
 }

 /**
 * @return void
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

 /**
 * Resets table creation vars
 *
 * @return void
 */
 public function reset()
 {
Expand Down

4 changes: 4 additions & 0 deletions
system/Database/Migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

 /**
 * Perform a migration step.
 *
 * @return void
 */
 abstract public function up();

 /**
 * Revert a migration step.
 *
 * @return void
 */
 abstract public function down();
}

10 changes: 10 additions & 0 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 *
 * @param string $path Full path to a valid migration file
 * @param string $path Namespace of the target migration
 *
 * @return bool
 */
 public function force(string $path, string $namespace, ?string $group = null)
 {
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

 /**
 * Truncates the history table.
 *
 * @return void
 */
 public function clearHistory()
 {
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
 * Add a history to the table.
 *
 * @param object $migration
 *
 * @return void
 */
 protected function addHistory($migration, int $batch)
 {
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
 * Removes a single history
 *
 * @param object $history
 *
 * @return void
 */
 protected function removeHistory($history)
 {
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
 /**
 * Ensures that we have created our migrations table
 * in the database.
 *
 * @return void
 */
 public function ensureTable()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

 /**
 * Build a DSN from the provided parameters
 *
 * @return void
 */
 protected function buildDSN()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
 * Escapes and inserts any binds into the finalQueryString property.
 *
 * @see https://regex101.com/r/EUEhay/5
 *
 * @return void
 */
 protected function compileBinds()
 {
Expand Down

10 changes: 6 additions & 4 deletions
system/Database/QueryInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
 *
 * @param mixed $binds
 *
 * @return mixed
 * @return $this
 */
 public function setQuery(string $sql, $binds = null, bool $setEscape = true);

 /**
 * Returns the final, processed query string after binding, etal
 * has been performed.
 *
 * @return mixed
 * @return string
 */
 public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
 * for it's start and end values. If no end value is present, will
 * use the current time to determine total duration.
 *
 * @return mixed
 * @return $this
 */
 public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

 /**
 * Stores the error description that happened for this query.
 *
 * @return $this
 */
 public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
 /**
 * Swaps out one table prefix for a new one.
 *
 * @return mixed
 * @return $this
 */
 public function swapPrefix(string $orig, string $swap);
}

2 changes: 2 additions & 0 deletions
system/Database/ResultInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

 /**
 * Frees the current result.
 *
 * @return void
 */
 public function freeResult();

Expand Down

6 changes: 4 additions & 2 deletions
system/Database/SQLite3/Table.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
 * Class Table
 *
 * Provides missing features for altering tables that are common
 * in other supported databases, but are missing from SQLite.
 * These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
 * Copies data from our old table to the new one,
 * taking care map data correctly based on any columns
 * that have been renamed.
 *
 * @return void
 */
 protected function copyData()
 {
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
 /**
 * Attempts to drop all indexes and constraints
 * from the database for this table.
 *
 * @return void
 */
 protected function dropIndexes()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Seeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
 /**
 * Loads the specified seeder and runs it.
 *
 * @return void
 *
 * @throws InvalidArgumentException
 */
 public function call(string $class)
Expand Down

2 changes: 2 additions & 0 deletions
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
 /**
 * Returns the 404 Override settings from the Collection.
 * If the override is a string, will split to controller/index array.
 *
 * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
 */
 public function get404Override()
 {
Expand Down

17 changes: 17 additions & 0 deletions
system/Session/Exceptions/SessionException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
 /**
 * @return static
 */
 public static function forMissingDatabaseTable()
 {
 return new static(lang('Session.missingDatabaseTable'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePath(?string $path = null)
 {
 return new static(lang('Session.invalidSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forWriteProtectedSavePath(?string $path = null)
 {
 return new static(lang('Session.writeProtectedSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forEmptySavepath()
 {
 return new static(lang('Session.emptySavePath'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePathFormat(string $path)
 {
 return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
 /**
 * @deprecated
 *
 * @return static
 *
 * @codeCoverageIgnore
 */
 public static function forInvalidSameSiteSetting(string $samesite)
Expand Down

2 changes: 2 additions & 0 deletions
system/Session/Handlers/Database/PostgreHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
 /**
 * Sets SELECT clause
 *
 * @return void
 */
 protected function setSelect(BaseBuilder $builder)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor: fix missingType.return errors in system files#9530

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.

 Sign up for GitHub

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

paulbalandan
merged 1 commit into

from

Apr 19, 2025
 Merged


refactor: fix missingType.return errors in system files
#9530
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 3 additions & 1 deletion
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
 $this->response->setStatusCode($e->getCode());

 // Is there a 404 Override available?
 if ($override = $this->router->get404Override()) {
 $override = $this->router->get404Override();

 if ($override !== null) {
 $returned = null;

 if ($override instanceof Closure) {
Expand Down

2 changes: 1 addition & 1 deletion
system/ComposerScripts.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ final class ComposerScripts
 * This static method is called by Composer after every update event,
 * i.e., `composer install`, `composer update`, `composer remove`.
 */
 public static function postUpdate()
 public static function postUpdate(): void
 {
 self::recursiveDelete(self::$path);

Expand Down

6 changes: 6 additions & 0 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3380,6 +3380,8 @@ public function resetQuery()
 * Resets the query builder values. Called by the get() function
 *
 * @param array $qbResetItems An array of fields to reset
 *
 * @return void
 */
 protected function resetRun(array $qbResetItems)
 {
Expand All@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)

 /**
 * Resets the query builder values. Called by the get() function
 *
 * @return void
 */
 protected function resetSelect()
 {
Expand DownExpand Up@@ -3421,6 +3425,8 @@ protected function resetSelect()
 * Resets the query builder "write" values.
 *
 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
 *
 * @return void
 */
 protected function resetWrite()
 {
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,6 @@
use Config\Database as DbConfig;

/**
 * Class Config
 *
 * @see \CodeIgniter\Database\ConfigTest
 */
class Config extends BaseConfig
Expand DownExpand Up@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)

 /**
 * Ensures the database Connection Manager/Factory is loaded and ready to use.
 *
 * @return void
 */
 protected static function ensureFactory()
 {
Expand Down

12 changes: 12 additions & 0 deletions
system/Database/Exceptions/DataException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
 return new static(lang('Database.invalidArgument', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forInvalidAllowedFields(string $model)
 {
 return new static(lang('Database.invalidAllowedFields', [$model]));
 }

 /**
 * @return DataException
 */
 public static function forTableNotFound(string $table)
 {
 return new static(lang('Database.tableNotFound', [$table]));
 }

 /**
 * @return DataException
 */
 public static function forEmptyInputGiven(string $argument)
 {
 return new static(lang('Database.forEmptyInputGiven', [$argument]));
 }

 /**
 * @return DataException
 */
 public static function forFindColumnHaveMultipleColumns()
 {
 return new static(lang('Database.forFindColumnHaveMultipleColumns'));
Expand Down

15 changes: 15 additions & 0 deletions
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string

 /**
 * Performs a data type mapping between different databases.
 *
 * @return void
 */
 protected function _attributeType(array &$attributes)
 {
Expand All@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
 * if $attributes['TYPE'] is found in the array
 * - array(TYPE => UTYPE) will change $field['type'],
 * from TYPE to UTYPE in case of a match
 *
 * @return void
 */
 protected function _attributeUnsigned(array &$attributes, array &$field)
 {
Expand DownExpand Up@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
 $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
 }

 /**
 * @return void
 */
 protected function _attributeDefault(array &$attributes, array &$field)
 {
 if ($this->default === false) {
Expand All@@ -1051,13 +1058,19 @@ protected function _attributeDefault(array &$attributes, array &$field)
 }
 }

 /**
 * @return void
 */
 protected function _attributeUnique(array &$attributes, array &$field)
 {
 if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
 $field['unique'] = ' UNIQUE';
 }
 }

 /**
 * @return void
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
Expand DownExpand Up@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar

 /**
 * Resets table creation vars
 *
 * @return void
 */
 public function reset()
 {
Expand Down

4 changes: 4 additions & 0 deletions
system/Database/Migration.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,11 +64,15 @@ public function getDBGroup(): ?string

 /**
 * Perform a migration step.
 *
 * @return void
 */
 abstract public function up();

 /**
 * Revert a migration step.
 *
 * @return void
 */
 abstract public function down();
}

10 changes: 10 additions & 0 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 *
 * @param string $path Full path to a valid migration file
 * @param string $path Namespace of the target migration
 *
 * @return bool
 */
 public function force(string $path, string $namespace, ?string $group = null)
 {
Expand DownExpand Up@@ -575,6 +577,8 @@ public function clearCliMessages()

 /**
 * Truncates the history table.
 *
 * @return void
 */
 public function clearHistory()
 {
Expand All@@ -587,6 +591,8 @@ public function clearHistory()
 * Add a history to the table.
 *
 * @param object $migration
 *
 * @return void
 */
 protected function addHistory($migration, int $batch)
 {
Expand DownExpand Up@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
 * Removes a single history
 *
 * @param object $history
 *
 * @return void
 */
 protected function removeHistory($history)
 {
Expand DownExpand Up@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
 /**
 * Ensures that we have created our migrations table
 * in the database.
 *
 * @return void
 */
 public function ensureTable()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,8 @@ public function insertID()

 /**
 * Build a DSN from the provided parameters
 *
 * @return void
 */
 protected function buildDSN()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
 * Escapes and inserts any binds into the finalQueryString property.
 *
 * @see https://regex101.com/r/EUEhay/5
 *
 * @return void
 */
 protected function compileBinds()
 {
Expand Down

10 changes: 6 additions & 4 deletions
system/Database/QueryInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,15 @@ interface QueryInterface
 *
 * @param mixed $binds
 *
 * @return mixed
 * @return $this
 */
 public function setQuery(string $sql, $binds = null, bool $setEscape = true);

 /**
 * Returns the final, processed query string after binding, etal
 * has been performed.
 *
 * @return mixed
 * @return string
 */
 public function getQuery();

Expand All@@ -43,7 +43,7 @@ public function getQuery();
 * for it's start and end values. If no end value is present, will
 * use the current time to determine total duration.
 *
 * @return mixed
 * @return $this
 */
 public function setDuration(float $start, ?float $end = null);

Expand All@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;

 /**
 * Stores the error description that happened for this query.
 *
 * @return $this
 */
 public function setError(int $code, string $error);

Expand All@@ -83,7 +85,7 @@ public function isWriteType(): bool;
 /**
 * Swaps out one table prefix for a new one.
 *
 * @return mixed
 * @return $this
 */
 public function swapPrefix(string $orig, string $swap);
}

2 changes: 2 additions & 0 deletions
system/Database/ResultInterface.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -170,6 +170,8 @@ public function getFieldData(): array;

 /**
 * Frees the current result.
 *
 * @return void
 */
 public function freeResult();

Expand Down

6 changes: 4 additions & 2 deletions
system/Database/SQLite3/Table.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@
use stdClass;

/**
 * Class Table
 *
 * Provides missing features for altering tables that are common
 * in other supported databases, but are missing from SQLite.
 * These are needed in order to support migrations during testing
Expand DownExpand Up@@ -345,6 +343,8 @@ protected function createTable()
 * Copies data from our old table to the new one,
 * taking care map data correctly based on any columns
 * that have been renamed.
 *
 * @return void
 */
 protected function copyData()
 {
Expand DownExpand Up@@ -472,6 +472,8 @@ protected function formatKeys($keys)
 /**
 * Attempts to drop all indexes and constraints
 * from the database for this table.
 *
 * @return void
 */
 protected function dropIndexes()
 {
Expand Down

2 changes: 2 additions & 0 deletions
system/Database/Seeder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ public static function faker(): ?Generator
 /**
 * Loads the specified seeder and runs it.
 *
 * @return void
 *
 * @throws InvalidArgumentException
 */
 public function call(string $class)
Expand Down

2 changes: 2 additions & 0 deletions
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,8 @@ public function methodName(): string
 /**
 * Returns the 404 Override settings from the Collection.
 * If the override is a string, will split to controller/index array.
 *
 * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
 */
 public function get404Override()
 {
Expand Down

17 changes: 17 additions & 0 deletions
system/Session/Exceptions/SessionException.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,26 +17,41 @@

class SessionException extends FrameworkException
{
 /**
 * @return static
 */
 public static function forMissingDatabaseTable()
 {
 return new static(lang('Session.missingDatabaseTable'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePath(?string $path = null)
 {
 return new static(lang('Session.invalidSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forWriteProtectedSavePath(?string $path = null)
 {
 return new static(lang('Session.writeProtectedSavePath', [$path]));
 }

 /**
 * @return static
 */
 public static function forEmptySavepath()
 {
 return new static(lang('Session.emptySavePath'));
 }

 /**
 * @return static
 */
 public static function forInvalidSavePathFormat(string $path)
 {
 return new static(lang('Session.invalidSavePathFormat', [$path]));
Expand All@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
 /**
 * @deprecated
 *
 * @return static
 *
 * @codeCoverageIgnore
 */
 public static function forInvalidSameSiteSetting(string $samesite)
Expand Down

2 changes: 2 additions & 0 deletions
system/Session/Handlers/Database/PostgreHandler.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
{
 /**
 * Sets SELECT clause
 *
 * @return void
 */
 protected function setSelect(BaseBuilder $builder)
 {
Expand Down
Loading