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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

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
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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

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
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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

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
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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

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
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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

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
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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

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
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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

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
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
36 changes: 0 additions & 36 deletions phpstan-baseline.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13069,12 +13069,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 4,
'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php',
];
$ignoreErrors[] = [
// identifier: property.phpDocType
'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\<int, class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\>\\>\\|class\\-string\\<CodeIgniter\\\\Database\\\\Seeder\\> of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#',
Expand DownExpand Up@@ -13177,12 +13171,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#',
'count' => 9,
'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\<int, CodeIgniter\\\\Database\\\\RawSql\\|string\\>\\|string, array\\<string, CodeIgniter\\\\Database\\\\RawSql\\> given\\.$#',
Expand DownExpand Up@@ -13543,12 +13531,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/Format/FormatTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand DownExpand Up@@ -13675,12 +13657,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.return
'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#',
Expand DownExpand Up@@ -16843,12 +16819,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#',
'count' => 17,
'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php',
];
$ignoreErrors[] = [
// identifier: class.notFound
'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#',
Expand DownExpand Up@@ -17317,12 +17287,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php',
];
$ignoreErrors[] = [
// identifier: method.nameCase
'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#',
'count' => 2,
'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#',
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ControllerTestTrait.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
*
* $this->withRequest($request)
* ->withResponse($response)
* ->withURI($uri)
* ->withUri($uri)
* ->withBody($body)
* ->controller('App\Controllers\Home')
* ->execute('methodName');
Expand Down
8 changes: 4 additions & 4 deletions tests/system/Database/Live/InsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 5])
->getWhere(['id' => 5])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void
$this->db->table('job')->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

$this->assertSame('Cab Driver', $row->name);
Expand All@@ -135,7 +135,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();
$this->assertSame('John Smith', $row->name);

Expand All@@ -147,7 +147,7 @@ public function testReplaceTwice(): void
$builder->replace($data);

$row = $this->db->table('job')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();
$this->assertSame('Hans Schmidt', $row->name);
}
Expand Down
18 changes: 9 additions & 9 deletions tests/system/Database/Live/UpsertTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void
->upsert($userData);

$new = $this->db->table('user')
->getwhere(['email' => 'ahmadinejad@world.com'])
->getWhere(['email' => 'ahmadinejad@world.com'])
->getRow();

$this->assertSame(5, (int) $new->id);
Expand DownExpand Up@@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void
$this->db->table('user')->upsert($data);

$original = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$data = [
Expand All@@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void

// get by id
$row = $this->db->table('user')
->getwhere(['id' => 6])
->getWhere(['id' => 6])
->getRow();

$this->assertSame('Random Name 356', $row->name);
Expand DownExpand Up@@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['id' => 1])
->getWhere(['id' => 1])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['id' => 2])
->getWhere(['id' => 2])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['id' => 3])
->getWhere(['id' => 3])
->getRow();

$this->assertSame('Upsert One On Id', $row1->name);
Expand DownExpand Up@@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void

// get by id
$row1 = $this->db->table('user')
->getwhere(['email' => 'nullone@domain.com'])
->getWhere(['email' => 'nullone@domain.com'])
->getRow();

// get by id
$row2 = $this->db->table('user')
->getwhere(['email' => 'nulltwo@domain.com'])
->getWhere(['email' => 'nulltwo@domain.com'])
->getRow();

// get by id
$row3 = $this->db->table('user')
->getwhere(['email' => 'nullthree@domain.com'])
->getWhere(['email' => 'nullthree@domain.com'])
->getRow();

$this->assertSame('Null One', $row1->name);
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Format/FormatTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ public function testFormatConfigType(): void

public function testGetFormatter(): void
{
$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
$this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json'));
}

public function testGetFormatterExpectsExceptionOnUndefinedMime(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/system/HTTP/Files/FileCollectionTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void

$collection = new FileCollection();
$file = $collection->getFile('fileuser');
$this->AssertNull($file);
$this->assertNull($file);
}

public function testFileReturnValidMultipleFiles(): void
Expand Down
34 changes: 17 additions & 17 deletions tests/system/Test/ControllerTestTraitTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ public function testBadController(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(NeverHeardOfIt::class)
->execute('index');
Expand All@@ -59,7 +59,7 @@ public function testBadControllerMethod(): void
{
$this->expectException('InvalidArgumentException');
$logger = new Logger(new LoggerConfig());
$this->withURI('http://example.com')
$this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('nothere');
Expand All@@ -68,7 +68,7 @@ public function testBadControllerMethod(): void
public function testController(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Home::class)
->execute('index');
Expand All@@ -78,7 +78,7 @@ public function testController(): void

public function testControllerWithoutLogger(): void
{
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->controller(Home::class)
->execute('index');

Expand All@@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void
public function testPopcornIndex(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -99,7 +99,7 @@ public function testPopcornIndex(): void
public function testPopcornIndex2(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -111,7 +111,7 @@ public function testPopcornIndex2(): void
public function testPopcornFailure(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('pop');
Expand All@@ -122,7 +122,7 @@ public function testPopcornFailure(): void
public function testPopcornException(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void
$config = new App();
$body = '';

$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withConfig($config)
->withRequest(service('request', $config))
->withResponse(service('response', $config))
Expand All@@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void
public function testRequestPassthrough(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('popper');
Expand All@@ -164,7 +164,7 @@ public function testRequestPassthrough(): void
public function testFailureResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('oops');
Expand All@@ -176,7 +176,7 @@ public function testFailureResponse(): void
public function testEmptyResponse(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('weasel');
Expand All@@ -189,7 +189,7 @@ public function testEmptyResponse(): void
public function testRedirect(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('goaway');
Expand All@@ -200,7 +200,7 @@ public function testRedirect(): void
public function testDOMParserForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -211,7 +211,7 @@ public function testDOMParserForward(): void
public function testFailsForward(): void
{
$logger = new Logger(new LoggerConfig());
$result = $this->withURI('http://example.com')
$result = $this->withUri('http://example.com')
->withLogger($logger)
->controller(Popcorn::class)
->execute('index');
Expand All@@ -225,7 +225,7 @@ public function testFailsForward(): void
*/
public function testResponseOverriding(): void
{
$result = $this->withURI('http://example.com/rest/')
$result = $this->withUri('http://example.com/rest/')
->controller(Popcorn::class)
->execute('index3');

Expand DownExpand Up@@ -271,7 +271,7 @@ public function throwsBody(): never

public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void
{
$result = $this->withURI('http://example.com/foo/bar/1/2/3')
$result = $this->withUri('http://example.com/foo/bar/1/2/3')
->controller(Newautorouting::class)
->execute('postSave', '1', '2', '3');

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Validation/FormatRulesTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

/**
Expand All@@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
$data = [
'foo' => $value,
];
$this->assertsame($expected, $this->validation->run($data));
$this->assertSame($expected, $this->validation->run($data));
}

public static function provideInvalidIntegerType(): iterable
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance:
If you do not provide one, a new Logger instance with the default configuration values will be passed
into your controller.

withURI(string $uri)
withUri(string $uri)
--------------------

Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/testing/controllers/002.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase

public function testShowCategories()
{
$result = $this->withURI('http://example.com/categories')
$result = $this->withUri('http://example.com/categories')
->controller(ForumController::class)
->execute('showCategories');

Expand Down
Loading