test: fix missingType.return errors#9542

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 27, 2025
Merged

test: fix missingType.return errors #9542

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
6 changes: 6 additions & 0 deletions system/Config/Factories.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
/**
* Gets component data for caching.
*
* @return array{
* options: array<string, bool|string|null>,
* aliases: array<string, class-string>,
* instances: array<class-string, object>,
* }
*
* @internal For caching only
*/
public static function getComponentInstances(string $component): array
Expand Down
8 changes: 7 additions & 1 deletion system/Test/FilterTestTrait.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
* @param FilterInterface|string $filter The filter instance, class, or alias
* @param string $position "before" or "after"
*
* @phpstan-return Closure(list<string>|null=): mixed
* @return Closure(list<string>|null=): mixed
*/
protected function getFilterCaller($filter, string $position): Closure
{
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
* @param string $route The route to test
* @param string $position "before" or "after"
* @param string $alias Alias for the anticipated filter
*
* @return void
*/
protected function assertNotFilter(string $route, string $position, string $alias)
{
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
*
* @param string $route The route to test
* @param string $position "before" or "after"
*
* @return void
*/
protected function assertHasFilters(string $route, string $position)
{
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
*
* @param string $route The route to test
* @param string $position "before" or "after"
*
* @return void
*/
protected function assertNotHasFilters(string $route, string $position)
{
Expand Down
5 changes: 2 additions & 3 deletions system/Validation/Validation.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
* Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
/**
* Our configuration.
*
* @var ValidationConfig
* @var object{ruleSets: list<class-string>}
*/
protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
/**
* Validation constructor.
*
* @param ValidationConfig $config
* @param object{ruleSets: list<class-string>} $config
*/
public function __construct($config, RendererInterface $view)
{
Expand Down
4 changes: 2 additions & 2 deletions tests/system/API/ResponseTraitTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
}
}

protected function makeController(string $routePath = '', array $userHeaders = [])
protected function makeController(string $routePath = '', array $userHeaders = []): object
{
$this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
$this->assertSame($xmlFormatter->format($data), $this->response->getXML());
}

private function invoke(object $controller, string $method, array $args = [])
private function invoke(object $controller, string $method, array $args = []): object
{
$method = self::getPrivateMethodInvoker($controller, $method);

Expand Down
37 changes: 18 additions & 19 deletions tests/system/Cache/Handlers/FileHandlerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
private static string $directory = 'FileHandler';
private Cache $config;

private static function getKeyArray()
/**
* @return list<string>
*/
private static function getKeyArray(): array
{
return [
self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
$this->assertSame($string, $mode);
}

/**
* @return iterable<int, array{int, numeric-string}>
*/
public static function provideSaveMode(): iterable
{
return [
[
0640,
'640',
],
[
0600,
'600',
],
[
0660,
'660',
],
[
0777,
'777',
],
[0640, '640'],
[0600, '600'],
[0660, '660'],
[0777, '777'],
];
}

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
$this->config->file['storePath'] .= self::$directory;

parent::__construct($this->config);

helper('filesystem');
}

public function getFileInfoTest()
/**
* @return array<string, bool|int|string>|null
*/
public function getFileInfoTest(): ?array
{
$tmpHandle = tmpfile();
stream_get_meta_data($tmpHandle);

return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
'name',
'server_path',
'size',
Expand Down
5 changes: 4 additions & 1 deletion tests/system/Cache/Handlers/MemcachedHandlerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
private static function getKeyArray()
/**
* @return list<string>
*/
private static function getKeyArray(): array
{
return [
self::$key1,
Expand Down
5 changes: 4 additions & 1 deletion tests/system/Cache/Handlers/PredisHandlerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
private Cache $config;

private static function getKeyArray()
/**
* @return list<string>
*/
private static function getKeyArray(): array
{
return [
self::$key1,
Expand Down
5 changes: 4 additions & 1 deletion tests/system/Cache/Handlers/RedisHandlerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
private Cache $config;

private static function getKeyArray()
/**
* @return list<string>
*/
private static function getKeyArray(): array
{
return [
self::$key1,
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Commands/CreateDatabaseTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
}
}

protected function getBuffer()
protected function getBuffer(): string
{
return $this->getStreamFilterBuffer();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Commands/FilterCheckTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
parent::tearDown();
}

protected function getBuffer()
protected function getBuffer(): string
{
return $this->getStreamFilterBuffer();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Commands/HelpCommandTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
use StreamFilterTrait;

protected function getBuffer()
protected function getBuffer(): string
{
return $this->getStreamFilterBuffer();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Commands/InfoCacheTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
config('Cache')->handler = 'file';
}

protected function getBuffer()
protected function getBuffer(): string
{
return $this->getStreamFilterBuffer();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Commands/RoutesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
parent::tearDown();
}

protected function getBuffer()
protected function getBuffer(): string
{
return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Commands/Utilities/NamespacesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
/**
* @see https://regex101.com/r/l3lHfR/1
*/
protected function getBuffer()
protected function getBuffer(): string
{
return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
$matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down
31 changes: 29 additions & 2 deletions tests/system/Config/FactoriesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
Factories::reset();
}

protected function getFactoriesStaticProperty(...$params)
protected function getFactoriesStaticProperty(...$params): mixed
{
// First parameter is the actual property
$name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
$this->assertInstanceOf(EntityModel::class, $model);
}

public function testGetComponentInstances()
/**
* @return array{
* options: array<string, bool|string|null>,
* aliases: array<string, class-string>,
* instances: array<class-string, object>,
* }
*/
public function testGetComponentInstances(): array
{
Factories::config('App');
Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
return $data;
}

/**
* @param array{
* options: array<string, bool|string|null>,
* aliases: array<string, class-string>,
* instances: array<class-string, object>,
* } $data
*
* @return array{
* options: array<string, bool|string|null>,
* aliases: array<string, class-string>,
* instances: array<class-string, object>,
* }
*/
#[Depends('testGetComponentInstances')]
public function testSetComponentInstances(array $data)
{
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
return $data;
}

/**
* @param array{
* options: array<string, bool|string|null>,
* aliases: array<string, class-string>,
* instances: array<class-string, object>,
* } $data
*/
#[Depends('testSetComponentInstances')]
public function testIsUpdated(array $data): void
{
Expand Down
16 changes: 8 additions & 8 deletions tests/system/Entity/EntityTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
$this->assertSame(json_encode($entity->toArray()), json_encode($entity));
}

protected function getEntity()
private function getEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
};
}

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
};
}

protected function getMappedEntity()
private function getMappedEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
};
}

protected function getSwappedEntity()
private function getSwappedEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
};
}

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
};
}

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
{
return new class ($data) extends Entity {
protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
};
}

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
};
}

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Filters/fixtures/InvalidClass.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
public function index()
public function index(): string
{
return 'bad';
}
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/ContentSecurityPolicyTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
$this->csp = $this->response->getCSP();
}

protected function work(string $parm = 'Hello')
protected function work(string $parm = 'Hello'): bool
{
$body = $parm;
$this->response->setBody($body);
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
test: fix missingType.return errors#9542

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 27, 2025
 Merged


test: fix missingType.return errors
#9542
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


6 changes: 6 additions & 0 deletions
system/Config/Factories.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
 /**
 * Gets component data for caching.
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 *
 * @internal For caching only
 */
 public static function getComponentInstances(string $component): array
Expand Down

8 changes: 7 additions & 1 deletion
system/Test/FilterTestTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
 * @param FilterInterface|string $filter The filter instance, class, or alias
 * @param string $position "before" or "after"
 *
 * @phpstan-return Closure(list<string>|null=): mixed
 * @return Closure(list<string>|null=): mixed
 */
 protected function getFilterCaller($filter, string $position): Closure
 {
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
 * @param string $route The route to test
 * @param string $position "before" or "after"
 * @param string $alias Alias for the anticipated filter
 *
 * @return void
 */
 protected function assertNotFilter(string $route, string $position, string $alias)
 {
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertHasFilters(string $route, string $position)
 {
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertNotHasFilters(string $route, string $position)
 {
Expand Down

5 changes: 2 additions & 3 deletions
system/Validation/Validation.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
 * Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
 /**
 * Our configuration.
 *
 * @var ValidationConfig
 * @var object{ruleSets: list<class-string>}
 */
 protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
 /**
 * Validation constructor.
 *
 * @param ValidationConfig $config
 * @param object{ruleSets: list<class-string>} $config
 */
 public function __construct($config, RendererInterface $view)
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
 }
 }

 protected function makeController(string $routePath = '', array $userHeaders = [])
 protected function makeController(string $routePath = '', array $userHeaders = []): object
 {
 $this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
 $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
 }

 private function invoke(object $controller, string $method, array $args = [])
 private function invoke(object $controller, string $method, array $args = []): object
 {
 $method = self::getPrivateMethodInvoker($controller, $method);

Expand Down

37 changes: 18 additions & 19 deletions
tests/system/Cache/Handlers/FileHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
 private static string $directory = 'FileHandler';
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
 $this->assertSame($string, $mode);
 }

 /**
 * @return iterable<int, array{int, numeric-string}>
 */
 public static function provideSaveMode(): iterable
 {
 return [
 [
 0640,
 '640',
 ],
 [
 0600,
 '600',
 ],
 [
 0660,
 '660',
 ],
 [
 0777,
 '777',
 ],
 [0640, '640'],
 [0600, '600'],
 [0660, '660'],
 [0777, '777'],
 ];
 }

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
 $this->config->file['storePath'] .= self::$directory;

 parent::__construct($this->config);

 helper('filesystem');
 }

 public function getFileInfoTest()
 /**
 * @return array<string, bool|int|string>|null
 */
 public function getFileInfoTest(): ?array
 {
 $tmpHandle = tmpfile();
 stream_get_meta_data($tmpHandle);

 return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
 return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
 'name',
 'server_path',
 'size',
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/MemcachedHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/PredisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/RedisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/CreateDatabaseTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
 }
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/FilterCheckTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/HelpCommandTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
 use StreamFilterTrait;

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/InfoCacheTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
 config('Cache')->handler = 'file';
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/RoutesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 /**
 * @see https://regex101.com/r/l3lHfR/1
 */
 protected function getBuffer()
 protected function getBuffer(): string
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down

31 changes: 29 additions & 2 deletions
tests/system/Config/FactoriesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
 Factories::reset();
 }

 protected function getFactoriesStaticProperty(...$params)
 protected function getFactoriesStaticProperty(...$params): mixed
 {
 // First parameter is the actual property
 $name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
 $this->assertInstanceOf(EntityModel::class, $model);
 }

 public function testGetComponentInstances()
 /**
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 public function testGetComponentInstances(): array
 {
 Factories::config('App');
 Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 #[Depends('testGetComponentInstances')]
 public function testSetComponentInstances(array $data)
 {
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 */
 #[Depends('testSetComponentInstances')]
 public function testIsUpdated(array $data): void
 {
Expand Down

16 changes: 8 additions & 8 deletions
tests/system/Entity/EntityTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
 $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
 }

protected function getEntity()
private function getEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
 };
 }

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
 };
 }

protected function getMappedEntity()
private function getMappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
 };
 }

protected function getSwappedEntity()
private function getSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
 };
 }

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
 };
 }

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
 {
 return new class ($data) extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
 };
 }

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
 };
 }

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Filters/fixtures/InvalidClass.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
 public function index()
 public function index(): string
 {
 return 'bad';
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/HTTP/ContentSecurityPolicyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
 $this->csp = $this->response->getCSP();
 }

 protected function work(string $parm = 'Hello')
 protected function work(string $parm = 'Hello'): bool
 {
 $body = $parm;
 $this->response->setBody($body);
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
test: fix missingType.return errors#9542

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 27, 2025
 Merged


test: fix missingType.return errors
#9542
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


6 changes: 6 additions & 0 deletions
system/Config/Factories.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
 /**
 * Gets component data for caching.
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 *
 * @internal For caching only
 */
 public static function getComponentInstances(string $component): array
Expand Down

8 changes: 7 additions & 1 deletion
system/Test/FilterTestTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
 * @param FilterInterface|string $filter The filter instance, class, or alias
 * @param string $position "before" or "after"
 *
 * @phpstan-return Closure(list<string>|null=): mixed
 * @return Closure(list<string>|null=): mixed
 */
 protected function getFilterCaller($filter, string $position): Closure
 {
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
 * @param string $route The route to test
 * @param string $position "before" or "after"
 * @param string $alias Alias for the anticipated filter
 *
 * @return void
 */
 protected function assertNotFilter(string $route, string $position, string $alias)
 {
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertHasFilters(string $route, string $position)
 {
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertNotHasFilters(string $route, string $position)
 {
Expand Down

5 changes: 2 additions & 3 deletions
system/Validation/Validation.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
 * Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
 /**
 * Our configuration.
 *
 * @var ValidationConfig
 * @var object{ruleSets: list<class-string>}
 */
 protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
 /**
 * Validation constructor.
 *
 * @param ValidationConfig $config
 * @param object{ruleSets: list<class-string>} $config
 */
 public function __construct($config, RendererInterface $view)
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
 }
 }

 protected function makeController(string $routePath = '', array $userHeaders = [])
 protected function makeController(string $routePath = '', array $userHeaders = []): object
 {
 $this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
 $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
 }

 private function invoke(object $controller, string $method, array $args = [])
 private function invoke(object $controller, string $method, array $args = []): object
 {
 $method = self::getPrivateMethodInvoker($controller, $method);

Expand Down

37 changes: 18 additions & 19 deletions
tests/system/Cache/Handlers/FileHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
 private static string $directory = 'FileHandler';
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
 $this->assertSame($string, $mode);
 }

 /**
 * @return iterable<int, array{int, numeric-string}>
 */
 public static function provideSaveMode(): iterable
 {
 return [
 [
 0640,
 '640',
 ],
 [
 0600,
 '600',
 ],
 [
 0660,
 '660',
 ],
 [
 0777,
 '777',
 ],
 [0640, '640'],
 [0600, '600'],
 [0660, '660'],
 [0777, '777'],
 ];
 }

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
 $this->config->file['storePath'] .= self::$directory;

 parent::__construct($this->config);

 helper('filesystem');
 }

 public function getFileInfoTest()
 /**
 * @return array<string, bool|int|string>|null
 */
 public function getFileInfoTest(): ?array
 {
 $tmpHandle = tmpfile();
 stream_get_meta_data($tmpHandle);

 return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
 return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
 'name',
 'server_path',
 'size',
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/MemcachedHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/PredisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/RedisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/CreateDatabaseTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
 }
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/FilterCheckTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/HelpCommandTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
 use StreamFilterTrait;

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/InfoCacheTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
 config('Cache')->handler = 'file';
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/RoutesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 /**
 * @see https://regex101.com/r/l3lHfR/1
 */
 protected function getBuffer()
 protected function getBuffer(): string
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down

31 changes: 29 additions & 2 deletions
tests/system/Config/FactoriesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
 Factories::reset();
 }

 protected function getFactoriesStaticProperty(...$params)
 protected function getFactoriesStaticProperty(...$params): mixed
 {
 // First parameter is the actual property
 $name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
 $this->assertInstanceOf(EntityModel::class, $model);
 }

 public function testGetComponentInstances()
 /**
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 public function testGetComponentInstances(): array
 {
 Factories::config('App');
 Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 #[Depends('testGetComponentInstances')]
 public function testSetComponentInstances(array $data)
 {
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 */
 #[Depends('testSetComponentInstances')]
 public function testIsUpdated(array $data): void
 {
Expand Down

16 changes: 8 additions & 8 deletions
tests/system/Entity/EntityTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
 $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
 }

protected function getEntity()
private function getEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
 };
 }

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
 };
 }

protected function getMappedEntity()
private function getMappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
 };
 }

protected function getSwappedEntity()
private function getSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
 };
 }

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
 };
 }

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
 {
 return new class ($data) extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
 };
 }

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
 };
 }

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Filters/fixtures/InvalidClass.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
 public function index()
 public function index(): string
 {
 return 'bad';
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/HTTP/ContentSecurityPolicyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
 $this->csp = $this->response->getCSP();
 }

 protected function work(string $parm = 'Hello')
 protected function work(string $parm = 'Hello'): bool
 {
 $body = $parm;
 $this->response->setBody($body);
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
test: fix missingType.return errors#9542

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 27, 2025
 Merged


test: fix missingType.return errors
#9542
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


6 changes: 6 additions & 0 deletions
system/Config/Factories.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
 /**
 * Gets component data for caching.
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 *
 * @internal For caching only
 */
 public static function getComponentInstances(string $component): array
Expand Down

8 changes: 7 additions & 1 deletion
system/Test/FilterTestTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
 * @param FilterInterface|string $filter The filter instance, class, or alias
 * @param string $position "before" or "after"
 *
 * @phpstan-return Closure(list<string>|null=): mixed
 * @return Closure(list<string>|null=): mixed
 */
 protected function getFilterCaller($filter, string $position): Closure
 {
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
 * @param string $route The route to test
 * @param string $position "before" or "after"
 * @param string $alias Alias for the anticipated filter
 *
 * @return void
 */
 protected function assertNotFilter(string $route, string $position, string $alias)
 {
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertHasFilters(string $route, string $position)
 {
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertNotHasFilters(string $route, string $position)
 {
Expand Down

5 changes: 2 additions & 3 deletions
system/Validation/Validation.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
 * Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
 /**
 * Our configuration.
 *
 * @var ValidationConfig
 * @var object{ruleSets: list<class-string>}
 */
 protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
 /**
 * Validation constructor.
 *
 * @param ValidationConfig $config
 * @param object{ruleSets: list<class-string>} $config
 */
 public function __construct($config, RendererInterface $view)
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
 }
 }

 protected function makeController(string $routePath = '', array $userHeaders = [])
 protected function makeController(string $routePath = '', array $userHeaders = []): object
 {
 $this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
 $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
 }

 private function invoke(object $controller, string $method, array $args = [])
 private function invoke(object $controller, string $method, array $args = []): object
 {
 $method = self::getPrivateMethodInvoker($controller, $method);

Expand Down

37 changes: 18 additions & 19 deletions
tests/system/Cache/Handlers/FileHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
 private static string $directory = 'FileHandler';
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
 $this->assertSame($string, $mode);
 }

 /**
 * @return iterable<int, array{int, numeric-string}>
 */
 public static function provideSaveMode(): iterable
 {
 return [
 [
 0640,
 '640',
 ],
 [
 0600,
 '600',
 ],
 [
 0660,
 '660',
 ],
 [
 0777,
 '777',
 ],
 [0640, '640'],
 [0600, '600'],
 [0660, '660'],
 [0777, '777'],
 ];
 }

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
 $this->config->file['storePath'] .= self::$directory;

 parent::__construct($this->config);

 helper('filesystem');
 }

 public function getFileInfoTest()
 /**
 * @return array<string, bool|int|string>|null
 */
 public function getFileInfoTest(): ?array
 {
 $tmpHandle = tmpfile();
 stream_get_meta_data($tmpHandle);

 return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
 return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
 'name',
 'server_path',
 'size',
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/MemcachedHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/PredisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/RedisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/CreateDatabaseTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
 }
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/FilterCheckTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/HelpCommandTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
 use StreamFilterTrait;

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/InfoCacheTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
 config('Cache')->handler = 'file';
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/RoutesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 /**
 * @see https://regex101.com/r/l3lHfR/1
 */
 protected function getBuffer()
 protected function getBuffer(): string
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down

31 changes: 29 additions & 2 deletions
tests/system/Config/FactoriesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
 Factories::reset();
 }

 protected function getFactoriesStaticProperty(...$params)
 protected function getFactoriesStaticProperty(...$params): mixed
 {
 // First parameter is the actual property
 $name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
 $this->assertInstanceOf(EntityModel::class, $model);
 }

 public function testGetComponentInstances()
 /**
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 public function testGetComponentInstances(): array
 {
 Factories::config('App');
 Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 #[Depends('testGetComponentInstances')]
 public function testSetComponentInstances(array $data)
 {
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 */
 #[Depends('testSetComponentInstances')]
 public function testIsUpdated(array $data): void
 {
Expand Down

16 changes: 8 additions & 8 deletions
tests/system/Entity/EntityTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
 $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
 }

protected function getEntity()
private function getEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
 };
 }

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
 };
 }

protected function getMappedEntity()
private function getMappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
 };
 }

protected function getSwappedEntity()
private function getSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
 };
 }

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
 };
 }

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
 {
 return new class ($data) extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
 };
 }

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
 };
 }

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Filters/fixtures/InvalidClass.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
 public function index()
 public function index(): string
 {
 return 'bad';
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/HTTP/ContentSecurityPolicyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
 $this->csp = $this->response->getCSP();
 }

 protected function work(string $parm = 'Hello')
 protected function work(string $parm = 'Hello'): bool
 {
 $body = $parm;
 $this->response->setBody($body);
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
test: fix missingType.return errors#9542

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 27, 2025
 Merged


test: fix missingType.return errors
#9542
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


6 changes: 6 additions & 0 deletions
system/Config/Factories.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
 /**
 * Gets component data for caching.
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 *
 * @internal For caching only
 */
 public static function getComponentInstances(string $component): array
Expand Down

8 changes: 7 additions & 1 deletion
system/Test/FilterTestTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
 * @param FilterInterface|string $filter The filter instance, class, or alias
 * @param string $position "before" or "after"
 *
 * @phpstan-return Closure(list<string>|null=): mixed
 * @return Closure(list<string>|null=): mixed
 */
 protected function getFilterCaller($filter, string $position): Closure
 {
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
 * @param string $route The route to test
 * @param string $position "before" or "after"
 * @param string $alias Alias for the anticipated filter
 *
 * @return void
 */
 protected function assertNotFilter(string $route, string $position, string $alias)
 {
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertHasFilters(string $route, string $position)
 {
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertNotHasFilters(string $route, string $position)
 {
Expand Down

5 changes: 2 additions & 3 deletions
system/Validation/Validation.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
 * Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
 /**
 * Our configuration.
 *
 * @var ValidationConfig
 * @var object{ruleSets: list<class-string>}
 */
 protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
 /**
 * Validation constructor.
 *
 * @param ValidationConfig $config
 * @param object{ruleSets: list<class-string>} $config
 */
 public function __construct($config, RendererInterface $view)
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
 }
 }

 protected function makeController(string $routePath = '', array $userHeaders = [])
 protected function makeController(string $routePath = '', array $userHeaders = []): object
 {
 $this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
 $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
 }

 private function invoke(object $controller, string $method, array $args = [])
 private function invoke(object $controller, string $method, array $args = []): object
 {
 $method = self::getPrivateMethodInvoker($controller, $method);

Expand Down

37 changes: 18 additions & 19 deletions
tests/system/Cache/Handlers/FileHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
 private static string $directory = 'FileHandler';
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
 $this->assertSame($string, $mode);
 }

 /**
 * @return iterable<int, array{int, numeric-string}>
 */
 public static function provideSaveMode(): iterable
 {
 return [
 [
 0640,
 '640',
 ],
 [
 0600,
 '600',
 ],
 [
 0660,
 '660',
 ],
 [
 0777,
 '777',
 ],
 [0640, '640'],
 [0600, '600'],
 [0660, '660'],
 [0777, '777'],
 ];
 }

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
 $this->config->file['storePath'] .= self::$directory;

 parent::__construct($this->config);

 helper('filesystem');
 }

 public function getFileInfoTest()
 /**
 * @return array<string, bool|int|string>|null
 */
 public function getFileInfoTest(): ?array
 {
 $tmpHandle = tmpfile();
 stream_get_meta_data($tmpHandle);

 return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
 return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
 'name',
 'server_path',
 'size',
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/MemcachedHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/PredisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/RedisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/CreateDatabaseTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
 }
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/FilterCheckTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/HelpCommandTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
 use StreamFilterTrait;

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/InfoCacheTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
 config('Cache')->handler = 'file';
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/RoutesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 /**
 * @see https://regex101.com/r/l3lHfR/1
 */
 protected function getBuffer()
 protected function getBuffer(): string
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down

31 changes: 29 additions & 2 deletions
tests/system/Config/FactoriesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
 Factories::reset();
 }

 protected function getFactoriesStaticProperty(...$params)
 protected function getFactoriesStaticProperty(...$params): mixed
 {
 // First parameter is the actual property
 $name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
 $this->assertInstanceOf(EntityModel::class, $model);
 }

 public function testGetComponentInstances()
 /**
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 public function testGetComponentInstances(): array
 {
 Factories::config('App');
 Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 #[Depends('testGetComponentInstances')]
 public function testSetComponentInstances(array $data)
 {
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 */
 #[Depends('testSetComponentInstances')]
 public function testIsUpdated(array $data): void
 {
Expand Down

16 changes: 8 additions & 8 deletions
tests/system/Entity/EntityTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
 $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
 }

protected function getEntity()
private function getEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
 };
 }

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
 };
 }

protected function getMappedEntity()
private function getMappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
 };
 }

protected function getSwappedEntity()
private function getSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
 };
 }

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
 };
 }

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
 {
 return new class ($data) extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
 };
 }

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
 };
 }

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Filters/fixtures/InvalidClass.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
 public function index()
 public function index(): string
 {
 return 'bad';
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/HTTP/ContentSecurityPolicyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
 $this->csp = $this->response->getCSP();
 }

 protected function work(string $parm = 'Hello')
 protected function work(string $parm = 'Hello'): bool
 {
 $body = $parm;
 $this->response->setBody($body);
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
test: fix missingType.return errors#9542

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 27, 2025
 Merged


test: fix missingType.return errors
#9542
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


6 changes: 6 additions & 0 deletions
system/Config/Factories.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
 /**
 * Gets component data for caching.
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 *
 * @internal For caching only
 */
 public static function getComponentInstances(string $component): array
Expand Down

8 changes: 7 additions & 1 deletion
system/Test/FilterTestTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
 * @param FilterInterface|string $filter The filter instance, class, or alias
 * @param string $position "before" or "after"
 *
 * @phpstan-return Closure(list<string>|null=): mixed
 * @return Closure(list<string>|null=): mixed
 */
 protected function getFilterCaller($filter, string $position): Closure
 {
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
 * @param string $route The route to test
 * @param string $position "before" or "after"
 * @param string $alias Alias for the anticipated filter
 *
 * @return void
 */
 protected function assertNotFilter(string $route, string $position, string $alias)
 {
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertHasFilters(string $route, string $position)
 {
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertNotHasFilters(string $route, string $position)
 {
Expand Down

5 changes: 2 additions & 3 deletions
system/Validation/Validation.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
 * Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
 /**
 * Our configuration.
 *
 * @var ValidationConfig
 * @var object{ruleSets: list<class-string>}
 */
 protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
 /**
 * Validation constructor.
 *
 * @param ValidationConfig $config
 * @param object{ruleSets: list<class-string>} $config
 */
 public function __construct($config, RendererInterface $view)
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
 }
 }

 protected function makeController(string $routePath = '', array $userHeaders = [])
 protected function makeController(string $routePath = '', array $userHeaders = []): object
 {
 $this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
 $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
 }

 private function invoke(object $controller, string $method, array $args = [])
 private function invoke(object $controller, string $method, array $args = []): object
 {
 $method = self::getPrivateMethodInvoker($controller, $method);

Expand Down

37 changes: 18 additions & 19 deletions
tests/system/Cache/Handlers/FileHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
 private static string $directory = 'FileHandler';
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
 $this->assertSame($string, $mode);
 }

 /**
 * @return iterable<int, array{int, numeric-string}>
 */
 public static function provideSaveMode(): iterable
 {
 return [
 [
 0640,
 '640',
 ],
 [
 0600,
 '600',
 ],
 [
 0660,
 '660',
 ],
 [
 0777,
 '777',
 ],
 [0640, '640'],
 [0600, '600'],
 [0660, '660'],
 [0777, '777'],
 ];
 }

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
 $this->config->file['storePath'] .= self::$directory;

 parent::__construct($this->config);

 helper('filesystem');
 }

 public function getFileInfoTest()
 /**
 * @return array<string, bool|int|string>|null
 */
 public function getFileInfoTest(): ?array
 {
 $tmpHandle = tmpfile();
 stream_get_meta_data($tmpHandle);

 return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
 return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
 'name',
 'server_path',
 'size',
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/MemcachedHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/PredisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/RedisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/CreateDatabaseTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
 }
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/FilterCheckTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/HelpCommandTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
 use StreamFilterTrait;

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/InfoCacheTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
 config('Cache')->handler = 'file';
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/RoutesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 /**
 * @see https://regex101.com/r/l3lHfR/1
 */
 protected function getBuffer()
 protected function getBuffer(): string
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down

31 changes: 29 additions & 2 deletions
tests/system/Config/FactoriesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
 Factories::reset();
 }

 protected function getFactoriesStaticProperty(...$params)
 protected function getFactoriesStaticProperty(...$params): mixed
 {
 // First parameter is the actual property
 $name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
 $this->assertInstanceOf(EntityModel::class, $model);
 }

 public function testGetComponentInstances()
 /**
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 public function testGetComponentInstances(): array
 {
 Factories::config('App');
 Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 #[Depends('testGetComponentInstances')]
 public function testSetComponentInstances(array $data)
 {
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 */
 #[Depends('testSetComponentInstances')]
 public function testIsUpdated(array $data): void
 {
Expand Down

16 changes: 8 additions & 8 deletions
tests/system/Entity/EntityTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
 $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
 }

protected function getEntity()
private function getEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
 };
 }

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
 };
 }

protected function getMappedEntity()
private function getMappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
 };
 }

protected function getSwappedEntity()
private function getSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
 };
 }

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
 };
 }

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
 {
 return new class ($data) extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
 };
 }

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
 };
 }

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Filters/fixtures/InvalidClass.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
 public function index()
 public function index(): string
 {
 return 'bad';
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/HTTP/ContentSecurityPolicyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
 $this->csp = $this->response->getCSP();
 }

 protected function work(string $parm = 'Hello')
 protected function work(string $parm = 'Hello'): bool
 {
 $body = $parm;
 $this->response->setBody($body);
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
test: fix missingType.return errors#9542

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 27, 2025
 Merged


test: fix missingType.return errors
#9542
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


6 changes: 6 additions & 0 deletions
system/Config/Factories.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
 /**
 * Gets component data for caching.
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 *
 * @internal For caching only
 */
 public static function getComponentInstances(string $component): array
Expand Down

8 changes: 7 additions & 1 deletion
system/Test/FilterTestTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
 * @param FilterInterface|string $filter The filter instance, class, or alias
 * @param string $position "before" or "after"
 *
 * @phpstan-return Closure(list<string>|null=): mixed
 * @return Closure(list<string>|null=): mixed
 */
 protected function getFilterCaller($filter, string $position): Closure
 {
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
 * @param string $route The route to test
 * @param string $position "before" or "after"
 * @param string $alias Alias for the anticipated filter
 *
 * @return void
 */
 protected function assertNotFilter(string $route, string $position, string $alias)
 {
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertHasFilters(string $route, string $position)
 {
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertNotHasFilters(string $route, string $position)
 {
Expand Down

5 changes: 2 additions & 3 deletions
system/Validation/Validation.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
 * Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
 /**
 * Our configuration.
 *
 * @var ValidationConfig
 * @var object{ruleSets: list<class-string>}
 */
 protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
 /**
 * Validation constructor.
 *
 * @param ValidationConfig $config
 * @param object{ruleSets: list<class-string>} $config
 */
 public function __construct($config, RendererInterface $view)
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
 }
 }

 protected function makeController(string $routePath = '', array $userHeaders = [])
 protected function makeController(string $routePath = '', array $userHeaders = []): object
 {
 $this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
 $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
 }

 private function invoke(object $controller, string $method, array $args = [])
 private function invoke(object $controller, string $method, array $args = []): object
 {
 $method = self::getPrivateMethodInvoker($controller, $method);

Expand Down

37 changes: 18 additions & 19 deletions
tests/system/Cache/Handlers/FileHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
 private static string $directory = 'FileHandler';
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
 $this->assertSame($string, $mode);
 }

 /**
 * @return iterable<int, array{int, numeric-string}>
 */
 public static function provideSaveMode(): iterable
 {
 return [
 [
 0640,
 '640',
 ],
 [
 0600,
 '600',
 ],
 [
 0660,
 '660',
 ],
 [
 0777,
 '777',
 ],
 [0640, '640'],
 [0600, '600'],
 [0660, '660'],
 [0777, '777'],
 ];
 }

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
 $this->config->file['storePath'] .= self::$directory;

 parent::__construct($this->config);

 helper('filesystem');
 }

 public function getFileInfoTest()
 /**
 * @return array<string, bool|int|string>|null
 */
 public function getFileInfoTest(): ?array
 {
 $tmpHandle = tmpfile();
 stream_get_meta_data($tmpHandle);

 return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
 return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
 'name',
 'server_path',
 'size',
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/MemcachedHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/PredisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/RedisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/CreateDatabaseTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
 }
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/FilterCheckTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/HelpCommandTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
 use StreamFilterTrait;

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/InfoCacheTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
 config('Cache')->handler = 'file';
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/RoutesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 /**
 * @see https://regex101.com/r/l3lHfR/1
 */
 protected function getBuffer()
 protected function getBuffer(): string
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down

31 changes: 29 additions & 2 deletions
tests/system/Config/FactoriesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
 Factories::reset();
 }

 protected function getFactoriesStaticProperty(...$params)
 protected function getFactoriesStaticProperty(...$params): mixed
 {
 // First parameter is the actual property
 $name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
 $this->assertInstanceOf(EntityModel::class, $model);
 }

 public function testGetComponentInstances()
 /**
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 public function testGetComponentInstances(): array
 {
 Factories::config('App');
 Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 #[Depends('testGetComponentInstances')]
 public function testSetComponentInstances(array $data)
 {
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 */
 #[Depends('testSetComponentInstances')]
 public function testIsUpdated(array $data): void
 {
Expand Down

16 changes: 8 additions & 8 deletions
tests/system/Entity/EntityTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
 $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
 }

protected function getEntity()
private function getEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
 };
 }

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
 };
 }

protected function getMappedEntity()
private function getMappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
 };
 }

protected function getSwappedEntity()
private function getSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
 };
 }

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
 };
 }

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
 {
 return new class ($data) extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
 };
 }

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
 };
 }

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Filters/fixtures/InvalidClass.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
 public function index()
 public function index(): string
 {
 return 'bad';
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/HTTP/ContentSecurityPolicyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
 $this->csp = $this->response->getCSP();
 }

 protected function work(string $parm = 'Hello')
 protected function work(string $parm = 'Hello'): bool
 {
 $body = $parm;
 $this->response->setBody($body);
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
test: fix missingType.return errors#9542

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 27, 2025
 Merged


test: fix missingType.return errors
#9542
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


6 changes: 6 additions & 0 deletions
system/Config/Factories.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,6 +513,12 @@ public static function getBasename(string $alias): string
 /**
 * Gets component data for caching.
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 *
 * @internal For caching only
 */
 public static function getComponentInstances(string $component): array
Expand Down

8 changes: 7 additions & 1 deletion
system/Test/FilterTestTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
 * @param FilterInterface|string $filter The filter instance, class, or alias
 * @param string $position "before" or "after"
 *
 * @phpstan-return Closure(list<string>|null=): mixed
 * @return Closure(list<string>|null=): mixed
 */
 protected function getFilterCaller($filter, string $position): Closure
 {
Expand DownExpand Up@@ -268,6 +268,8 @@ protected function assertFilter(string $route, string $position, string $alias):
 * @param string $route The route to test
 * @param string $position "before" or "after"
 * @param string $alias Alias for the anticipated filter
 *
 * @return void
 */
 protected function assertNotFilter(string $route, string $position, string $alias)
 {
Expand All@@ -286,6 +288,8 @@ protected function assertNotFilter(string $route, string $position, string $alia
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertHasFilters(string $route, string $position)
 {
Expand All@@ -303,6 +307,8 @@ protected function assertHasFilters(string $route, string $position)
 *
 * @param string $route The route to test
 * @param string $position "before" or "after"
 *
 * @return void
 */
 protected function assertNotHasFilters(string $route, string $position)
 {
Expand Down

5 changes: 2 additions & 3 deletions
system/Validation/Validation.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\Validation\Exceptions\ValidationException;
use CodeIgniter\View\RendererInterface;
use Config\Validation as ValidationConfig;

/**
 * Validator
Expand DownExpand Up@@ -96,7 +95,7 @@ class Validation implements ValidationInterface
 /**
 * Our configuration.
 *
 * @var ValidationConfig
 * @var object{ruleSets: list<class-string>}
 */
 protected $config;

Expand All@@ -110,7 +109,7 @@ class Validation implements ValidationInterface
 /**
 * Validation constructor.
 *
 * @param ValidationConfig $config
 * @param object{ruleSets: list<class-string>} $config
 */
 public function __construct($config, RendererInterface $view)
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/API/ResponseTraitTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,7 +108,7 @@ private function createRequestAndResponse(string $routePath = '', array $userHea
 }
 }

 protected function makeController(string $routePath = '', array $userHeaders = [])
 protected function makeController(string $routePath = '', array $userHeaders = []): object
 {
 $this->createRequestAndResponse($routePath, $userHeaders);

Expand DownExpand Up@@ -659,7 +659,7 @@ public function testXMLResponseFormat(): void
 $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
 }

 private function invoke(object $controller, string $method, array $args = [])
 private function invoke(object $controller, string $method, array $args = []): object
 {
 $method = self::getPrivateMethodInvoker($controller, $method);

Expand Down

37 changes: 18 additions & 19 deletions
tests/system/Cache/Handlers/FileHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ final class FileHandlerTest extends AbstractHandlerTestCase
 private static string $directory = 'FileHandler';
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand DownExpand Up@@ -328,25 +331,16 @@ public function testSaveMode(int $int, string $string): void
 $this->assertSame($string, $mode);
 }

 /**
 * @return iterable<int, array{int, numeric-string}>
 */
 public static function provideSaveMode(): iterable
 {
 return [
 [
 0640,
 '640',
 ],
 [
 0600,
 '600',
 ],
 [
 0660,
 '660',
 ],
 [
 0777,
 '777',
 ],
 [0640, '640'],
 [0600, '600'],
 [0660, '660'],
 [0777, '777'],
 ];
 }

Expand DownExpand Up@@ -382,14 +376,19 @@ public function __construct()
 $this->config->file['storePath'] .= self::$directory;

 parent::__construct($this->config);

 helper('filesystem');
 }

 public function getFileInfoTest()
 /**
 * @return array<string, bool|int|string>|null
 */
 public function getFileInfoTest(): ?array
 {
 $tmpHandle = tmpfile();
 stream_get_meta_data($tmpHandle);

 return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
 return get_file_info(stream_get_meta_data($tmpHandle)['uri'], [
 'name',
 'server_path',
 'size',
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/MemcachedHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@
#[Group('CacheLive')]
final class MemcachedHandlerTest extends AbstractHandlerTestCase
{
 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/PredisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,10 @@ final class PredisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

5 changes: 4 additions & 1 deletion
tests/system/Cache/Handlers/RedisHandlerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,10 @@ final class RedisHandlerTest extends AbstractHandlerTestCase
{
 private Cache $config;

 private static function getKeyArray()
 /**
 * @return list<string>
 */
 private static function getKeyArray(): array
 {
 return [
 self::$key1,
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/CreateDatabaseTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ private function dropDatabase(): void
 }
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/FilterCheckTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/HelpCommandTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ final class HelpCommandTest extends CIUnitTestCase
{
 use StreamFilterTrait;

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/InfoCacheTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function tearDown(): void
 config('Cache')->handler = 'file';
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return $this->getStreamFilterBuffer();
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/RoutesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ protected function tearDown(): void
 parent::tearDown();
 }

 protected function getBuffer()
 protected function getBuffer(): string
 {
 return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 /**
 * @see https://regex101.com/r/l3lHfR/1
 */
 protected function getBuffer()
 protected function getBuffer(): string
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);
Expand Down

31 changes: 29 additions & 2 deletions
tests/system/Config/FactoriesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,7 @@ protected function setUp(): void
 Factories::reset();
 }

 protected function getFactoriesStaticProperty(...$params)
 protected function getFactoriesStaticProperty(...$params): mixed
 {
 // First parameter is the actual property
 $name = array_shift($params);
Expand DownExpand Up@@ -425,7 +425,14 @@ public function testDefineAndGet(): void
 $this->assertInstanceOf(EntityModel::class, $model);
 }

 public function testGetComponentInstances()
 /**
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 public function testGetComponentInstances(): array
 {
 Factories::config('App');
 Factories::config(Database::class);
Expand All@@ -439,6 +446,19 @@ public function testGetComponentInstances()
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 *
 * @return array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * }
 */
 #[Depends('testGetComponentInstances')]
 public function testSetComponentInstances(array $data)
 {
Expand All@@ -456,6 +476,13 @@ public function testSetComponentInstances(array $data)
 return $data;
 }

 /**
 * @param array{
 * options: array<string, bool|string|null>,
 * aliases: array<string, class-string>,
 * instances: array<class-string, object>,
 * } $data
 */
 #[Depends('testSetComponentInstances')]
 public function testIsUpdated(array $data): void
 {
Expand Down

16 changes: 8 additions & 8 deletions
tests/system/Entity/EntityTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1094,7 +1094,7 @@ public function testJsonSerializableEntity(): void
 $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
 }

protected function getEntity()
private function getEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1132,7 +1132,7 @@ public function getFakeBar(): string
 };
 }

protected function getNewSetterGetterEntity()
private function getNewSetterGetterEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1178,7 +1178,7 @@ public function _getBar(): string
 };
 }

protected function getMappedEntity()
private function getMappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1208,7 +1208,7 @@ protected function getSimple(): string
 };
 }

protected function getSwappedEntity()
private function getSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1227,7 +1227,7 @@ protected function getSwappedEntity()
 };
 }

protected function getSimpleSwappedEntity()
private function getSimpleSwappedEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand All@@ -1245,7 +1245,7 @@ protected function getSimpleSwappedEntity()
 };
 }

protected function getCastEntity($data = null): Entity
private function getCastEntity($data = null): object
 {
 return new class ($data) extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1303,7 +1303,7 @@ public function setSeventh(string $seventh): void
 };
 }

protected function getCastNullableEntity()
private function getCastNullableEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand DownExpand Up@@ -1332,7 +1332,7 @@ protected function getCastNullableEntity()
 };
 }

protected function getCustomCastEntity()
private function getCustomCastEntity(): object
 {
 return new class () extends Entity {
 protected $attributes = [
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Filters/fixtures/InvalidClass.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@

class InvalidClass
{
 public function index()
 public function index(): string
 {
 return 'bad';
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/HTTP/ContentSecurityPolicyTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ protected function prepare(bool $CSPEnabled = true): void
 $this->csp = $this->response->getCSP();
 }

 protected function work(string $parm = 'Hello')
 protected function work(string $parm = 'Hello'): bool
 {
 $body = $parm;
 $this->response->setBody($body);
Expand Down
Loading