Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions system/Config/Factories.php
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 Down Expand 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
Original file line number Diff line number Diff 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 Down Expand 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
Original file line number Diff line number Diff 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 Down Expand 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
Original file line number Diff line number Diff 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 Down Expand 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 Down Expand 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 Down Expand 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
Original file line number Diff line number Diff 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 Down Expand Up @@ -1132,7 +1132,7 @@ public function getFakeBar(): string
};
}

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

protected function getMappedEntity()
private function getMappedEntity(): object
{
return new class () extends Entity {
protected $attributes = [
Expand Down Expand 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 Down Expand 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 Down Expand 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
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
Loading