"},openInNewWindow:function(e){var t=window.open();t&&(t.document.open(),t.document.write(l.mktag("html")+l.mktag("head")+l.mktag("title")+"Kint ("+(new Date).toISOString()+")"+l.mktag("/title")+l.mktag('meta charset="utf-8"')+l.mktag('script class="kint-rich-script" nonce="'+l.script.nonce+'"')+l.script.innerHTML+l.mktag("/script")+l.mktag('style class="kint-rich-style" nonce="'+l.style.nonce+'"')+l.style.innerHTML+l.mktag("/style")+l.mktag("/head")+l.mktag("body")+''+e.parentNode.outerHTML+"
"+l.mktag("/body")),t.document.close())},sortTable:function(e,a){var t=e.tBodies[0];[].slice.call(e.tBodies[0].rows).sort(function(e,t){if(e=e.cells[a].textContent.trim().toLocaleLowerCase(),t=t.cells[a].textContent.trim().toLocaleLowerCase(),isNaN(e)||isNaN(t)){if(isNaN(e)&&!isNaN(t))return 1;if(isNaN(t)&&!isNaN(e))return-1}else e=parseFloat(e),t=parseFloat(t);return eli:not(.kint-active-tab)").forEach(function(e){l.isFolderOpen()&&!l.folder.contains(e)||0===e.offsetWidth&&0===e.offsetHeight||l.keyboardNav.targets.push(e)}),e&&-1!==l.keyboardNav.targets.indexOf(e)&&(l.keyboardNav.target=l.keyboardNav.targets.indexOf(e))},sync:function(e){var t=document.querySelector(".kint-focused");t&&t.classList.remove("kint-focused"),l.keyboardNav.active&&((t=l.keyboardNav.targets[l.keyboardNav.target]).classList.add("kint-focused"),e||l.keyboardNav.scroll(t))},scroll:function(e){var t,a;e!==l.folder.querySelector("dt > nav")&&(a=(t=function(e){return e.offsetTop+(e.offsetParent?t(e.offsetParent):0)})(e),l.isFolderOpen()?(e=l.folder.querySelector("dd.kint-foldout")).scrollTo(0,a-e.clientHeight/2):window.scrollTo(0,a-window.innerHeight/2))},moveCursor:function(e){for(l.keyboardNav.target+=e;l.keyboardNav.target<0;)l.keyboardNav.target+=l.keyboardNav.targets.length;for(;l.keyboardNav.target>=l.keyboardNav.targets.length;)l.keyboardNav.target-=l.keyboardNav.targets.length;l.keyboardNav.sync()},setCursor:function(e){if(l.isFolderOpen()&&!l.folder.contains(e))return!1;l.keyboardNav.fetchTargets();for(var t=0;t"},openInNewWindow:function(e){var t=window.open();t&&(t.document.open(),t.document.write(l.mktag("html")+l.mktag("head")+l.mktag("title")+"Kint ("+(new Date).toISOString()+")"+l.mktag("/title")+l.mktag('meta charset="utf-8"')+l.mktag('script class="kint-rich-script" nonce="'+l.script.nonce+'"')+l.script.innerHTML+l.mktag("/script")+l.mktag('style class="kint-rich-style" nonce="'+l.style.nonce+'"')+l.style.innerHTML+l.mktag("/style")+l.mktag("/head")+l.mktag("body")+''+e.parentNode.outerHTML+"
"+l.mktag("/body")),t.document.close())},sortTable:function(e,a){var t=e.tBodies[0];[].slice.call(e.tBodies[0].rows).sort(function(e,t){if(e=e.cells[a].textContent.trim().toLocaleLowerCase(),t=t.cells[a].textContent.trim().toLocaleLowerCase(),isNaN(e)||isNaN(t)){if(isNaN(e)&&!isNaN(t))return 1;if(isNaN(t)&&!isNaN(e))return-1}else e=parseFloat(e),t=parseFloat(t);return eli:not(.kint-active-tab)").forEach(function(e){l.isFolderOpen()&&!l.folder.contains(e)||0===e.offsetWidth&&0===e.offsetHeight||l.keyboardNav.targets.push(e)}),e&&-1!==l.keyboardNav.targets.indexOf(e)&&(l.keyboardNav.target=l.keyboardNav.targets.indexOf(e))},sync:function(e){var t=document.querySelector(".kint-focused");t&&t.classList.remove("kint-focused"),l.keyboardNav.active&&((t=l.keyboardNav.targets[l.keyboardNav.target]).classList.add("kint-focused"),e||l.keyboardNav.scroll(t))},scroll:function(e){var t,a;e!==l.folder.querySelector("dt > nav")&&(a=(t=function(e){return e.offsetTop+(e.offsetParent?t(e.offsetParent):0)})(e),l.isFolderOpen()?(e=l.folder.querySelector("dd.kint-foldout")).scrollTo(0,a-e.clientHeight/2):window.scrollTo(0,a-window.innerHeight/2))},moveCursor:function(e){for(l.keyboardNav.target+=e;l.keyboardNav.target<0;)l.keyboardNav.target+=l.keyboardNav.targets.length;for(;l.keyboardNav.target>=l.keyboardNav.targets.length;)l.keyboardNav.target-=l.keyboardNav.targets.length;l.keyboardNav.sync()},setCursor:function(e){if(l.isFolderOpen()&&!l.folder.contains(e))return!1;l.keyboardNav.fetchTargets();for(var t=0;t 'valid_cc_number[visa]'
* ];
*
- * @param mixed $ccNumber
+ * @param array|bool|float|int|object|string|null $ccNumber
*/
public function valid_cc_number($ccNumber, string $type): bool
{
diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index 97df6c04aecb..facb28664b2a 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -30,7 +30,7 @@ public function __construct()
/**
* Alpha
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function alpha($str = null): bool
{
@@ -44,7 +44,7 @@ public function alpha($str = null): bool
/**
* Alpha with spaces.
*
- * @param mixed $value Value.
+ * @param array|bool|float|int|object|string|null $value Value.
*
* @return bool True if alpha with spaces, else false.
*/
@@ -60,7 +60,7 @@ public function alpha_space($value = null): bool
/**
* Alphanumeric with underscores and dashes
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function alpha_dash($str = null): bool
{
@@ -82,7 +82,7 @@ public function alpha_dash($str = null): bool
* _ underscore, + plus, = equals, | vertical bar, : colon, . period
* ~ ! # $ % & * - _ + = | : .
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*
* @return bool
*/
@@ -102,7 +102,7 @@ public function alpha_numeric_punct($str)
/**
* Alphanumeric
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function alpha_numeric($str = null): bool
{
@@ -120,7 +120,7 @@ public function alpha_numeric($str = null): bool
/**
* Alphanumeric w/ spaces
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function alpha_numeric_space($str = null): bool
{
@@ -138,7 +138,7 @@ public function alpha_numeric_space($str = null): bool
/**
* Any type of string
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function string($str = null): bool
{
@@ -148,7 +148,7 @@ public function string($str = null): bool
/**
* Decimal number
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function decimal($str = null): bool
{
@@ -166,7 +166,7 @@ public function decimal($str = null): bool
/**
* String of hexidecimal characters
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function hex($str = null): bool
{
@@ -184,7 +184,7 @@ public function hex($str = null): bool
/**
* Integer
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function integer($str = null): bool
{
@@ -202,7 +202,7 @@ public function integer($str = null): bool
/**
* Is a Natural number (0,1,2,3, etc.)
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function is_natural($str = null): bool
{
@@ -220,7 +220,7 @@ public function is_natural($str = null): bool
/**
* Is a Natural number, but not a zero (1,2,3, etc.)
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function is_natural_no_zero($str = null): bool
{
@@ -238,7 +238,7 @@ public function is_natural_no_zero($str = null): bool
/**
* Numeric
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function numeric($str = null): bool
{
@@ -256,7 +256,7 @@ public function numeric($str = null): bool
/**
* Compares value against a regular expression pattern.
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function regex_match($str, string $pattern): bool
{
@@ -273,7 +273,7 @@ public function regex_match($str, string $pattern): bool
*
* @see http://php.net/manual/en/datetimezone.listidentifiers.php
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function timezone($str = null): bool
{
@@ -290,7 +290,7 @@ public function timezone($str = null): bool
* Tests a string for characters outside of the Base64 alphabet
* as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function valid_base64($str = null): bool
{
@@ -304,7 +304,7 @@ public function valid_base64($str = null): bool
/**
* Valid JSON
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function valid_json($str = null): bool
{
@@ -318,7 +318,7 @@ public function valid_json($str = null): bool
/**
* Checks for a correctly formatted email address
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function valid_email($str = null): bool
{
@@ -335,7 +335,7 @@ public function valid_email($str = null): bool
* Example:
* valid_emails[one@example.com,two@example.com]
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function valid_emails($str = null): bool
{
@@ -349,8 +349,8 @@ public function valid_emails($str = null): bool
/**
* Validate an IP address (human readable format or binary string - inet_pton)
*
- * @param mixed $ip
- * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
+ * @param array|bool|float|int|object|string|null $ip
+ * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
*/
public function valid_ip($ip = null, ?string $which = null): bool
{
@@ -367,7 +367,7 @@ public function valid_ip($ip = null, ?string $which = null): bool
* Warning: this rule will pass basic strings like
* "banana"; use valid_url_strict for a stricter rule.
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function valid_url($str = null): bool
{
@@ -381,8 +381,8 @@ public function valid_url($str = null): bool
/**
* Checks a URL to ensure it's formed correctly.
*
- * @param mixed $str
- * @param string|null $validSchemes comma separated list of allowed schemes
+ * @param array|bool|float|int|object|string|null $str
+ * @param string|null $validSchemes comma separated list of allowed schemes
*/
public function valid_url_strict($str = null, ?string $validSchemes = null): bool
{
@@ -396,7 +396,7 @@ public function valid_url_strict($str = null, ?string $validSchemes = null): boo
/**
* Checks for a valid date and matches a given date format
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function valid_date($str = null, ?string $format = null): bool
{
diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index 76f32a9c1fe4..47dbee9b5ae7 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/system/Validation/StrictRules/Rules.php
@@ -31,8 +31,8 @@ public function __construct()
/**
* The value does not match another field in $data.
*
- * @param mixed $str
- * @param array $data Other field/value pairs
+ * @param array|bool|float|int|object|string|null $str
+ * @param array $data Other field/value pairs
*/
public function differs($str, string $field, array $data): bool
{
@@ -46,7 +46,7 @@ public function differs($str, string $field, array $data): bool
/**
* Equals the static value provided.
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function equals($str, string $val): bool
{
@@ -57,7 +57,7 @@ public function equals($str, string $val): bool
* Returns true if $str is $val characters long.
* $val = "5" (one) | "5,8,12" (multiple values)
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function exact_length($str, string $val): bool
{
@@ -71,7 +71,7 @@ public function exact_length($str, string $val): bool
/**
* Greater than
*
- * @param mixed $str expects int|string
+ * @param array|bool|float|int|object|string|null $str expects int|string
*/
public function greater_than($str, string $min): bool
{
@@ -89,7 +89,7 @@ public function greater_than($str, string $min): bool
/**
* Equal to or Greater than
*
- * @param mixed $str expects int|string
+ * @param array|bool|float|int|object|string|null $str expects int|string
*/
public function greater_than_equal_to($str, string $min): bool
{
@@ -113,7 +113,7 @@ public function greater_than_equal_to($str, string $min): bool
* is_not_unique[table.field,where_field,where_value]
* is_not_unique[menu.id,active,1]
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function is_not_unique($str, string $field, array $data): bool
{
@@ -123,7 +123,7 @@ public function is_not_unique($str, string $field, array $data): bool
/**
* Value should be within an array of values
*
- * @param mixed $value
+ * @param array|bool|float|int|object|string|null $value
*/
public function in_list($value, string $list): bool
{
@@ -147,7 +147,7 @@ public function in_list($value, string $list): bool
* is_unique[table.field,ignore_field,ignore_value]
* is_unique[users.email,id,5]
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function is_unique($str, string $field, array $data): bool
{
@@ -157,7 +157,7 @@ public function is_unique($str, string $field, array $data): bool
/**
* Less than
*
- * @param mixed $str expects int|string
+ * @param array|bool|float|int|object|string|null $str expects int|string
*/
public function less_than($str, string $max): bool
{
@@ -175,7 +175,7 @@ public function less_than($str, string $max): bool
/**
* Equal to or Less than
*
- * @param mixed $str expects int|string
+ * @param array|bool|float|int|object|string|null $str expects int|string
*/
public function less_than_equal_to($str, string $max): bool
{
@@ -193,8 +193,8 @@ public function less_than_equal_to($str, string $max): bool
/**
* Matches the value of another field in $data.
*
- * @param mixed $str
- * @param array $data Other field/value pairs
+ * @param array|bool|float|int|object|string|null $str
+ * @param array $data Other field/value pairs
*/
public function matches($str, string $field, array $data): bool
{
@@ -204,7 +204,7 @@ public function matches($str, string $field, array $data): bool
/**
* Returns true if $str is $val or fewer characters in length.
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function max_length($str, string $val): bool
{
@@ -222,7 +222,7 @@ public function max_length($str, string $val): bool
/**
* Returns true if $str is at least $val length.
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function min_length($str, string $val): bool
{
@@ -240,7 +240,7 @@ public function min_length($str, string $val): bool
/**
* Does not equal the static value provided.
*
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function not_equals($str, string $val): bool
{
@@ -250,7 +250,7 @@ public function not_equals($str, string $val): bool
/**
* Value should not be within an array of values.
*
- * @param mixed $value
+ * @param array|bool|float|int|object|string|null $value
*/
public function not_in_list($value, string $list): bool
{
@@ -270,7 +270,7 @@ public function not_in_list($value, string $list): bool
}
/**
- * @param mixed $str
+ * @param array|bool|float|int|object|string|null $str
*/
public function required($str = null): bool
{
@@ -285,9 +285,9 @@ public function required($str = null): bool
*
* required_with[password]
*
- * @param mixed $str
- * @param string|null $fields List of fields that we should check if present
- * @param array $data Complete list of fields from the form
+ * @param array|bool|float|int|object|string|null $str
+ * @param string|null $fields List of fields that we should check if present
+ * @param array $data Complete list of fields from the form
*/
public function required_with($str = null, ?string $fields = null, array $data = []): bool
{
@@ -302,9 +302,9 @@ public function required_with($str = null, ?string $fields = null, array $data =
*
* required_without[id,email]
*
- * @param string|null $str
- * @param string|null $otherFields The param fields of required_without[].
- * @param string|null $field This rule param fields aren't present, this field is required.
+ * @param array|bool|float|int|object|string|null $str
+ * @param string|null $otherFields The param fields of required_without[].
+ * @param string|null $field This rule param fields aren't present, this field is required.
*/
public function required_without($str = null, ?string $otherFields = null, array $data = [], ?string $error = null, ?string $field = null): bool
{
diff --git a/system/View/Filters.php b/system/View/Filters.php
index 79324322c0b0..e2c827927796 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -75,6 +75,7 @@ public static function default($value, string $default): string
* Escapes the given value with our `esc()` helper function.
*
* @param string $value
+ * @phpstan-param 'html'|'js'|'css'|'url'|'attr'|'raw' $context
*/
public static function esc($value, string $context = 'html'): string
{
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 9b425602c904..ea8c41fd1cfa 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -277,7 +277,7 @@ protected function parsePair(string $variable, array $data, string $template): a
// have something to loop over.
preg_match_all(
'#' . $this->leftDelimiter . '\s*' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '(.+?)' .
- $this->leftDelimiter . '\s*' . '/' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '#s',
+ $this->leftDelimiter . '\s*/' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '#s',
$template,
$matches,
PREG_SET_ORDER
diff --git a/system/View/View.php b/system/View/View.php
index b0206d67caba..9a39104728df 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -305,8 +305,9 @@ public function excerpt(string $string, int $length = 20): string
/**
* Sets several pieces of view data at once.
*
- * @param string $context The context to escape it for: html, css, js, url
- * If null, no escaping will happen
+ * @param string|null $context The context to escape it for: html, css, js, url
+ * If null, no escaping will happen
+ * @phpstan-param null|'html'|'js'|'css'|'url'|'attr'|'raw' $context
*/
public function setData(array $data = [], ?string $context = null): RendererInterface
{
@@ -326,6 +327,7 @@ public function setData(array $data = [], ?string $context = null): RendererInte
* @param mixed $value
* @param string|null $context The context to escape it for: html, css, js, url
* If null, no escaping will happen
+ * @phpstan-param null|'html'|'js'|'css'|'url'|'attr'|'raw' $context
*/
public function setVar(string $name, $value = null, ?string $context = null): RendererInterface
{
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index d9a0ec8f3bed..fb43d37a9ff4 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -167,7 +167,7 @@ public function run()
}
if ($this->db->DBDriver === 'OCI8') {
- $this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY/MM/DD HH24:MI:SS']);
+ $this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY-MM-DD HH24:MI:SS']);
$data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
$data['type_test'][0]['type_date'] = '2020-01-11 22:11:00';
$data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index e20a32c2b0b6..82c893e271e9 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -47,8 +47,8 @@ public function __construct(array $config)
* will stop. Any handlers that have not run, yet, will not
* be run.
*
- * @param $level
- * @param $message
+ * @param string $level
+ * @param string $message
*/
public function handle($level, $message): bool
{
diff --git a/tests/_support/Models/FabricatorModel.php b/tests/_support/Models/FabricatorModel.php
index 70efeeb5c942..68987a7f096d 100644
--- a/tests/_support/Models/FabricatorModel.php
+++ b/tests/_support/Models/FabricatorModel.php
@@ -30,7 +30,7 @@ class FabricatorModel extends Model
public function fake(Generator &$faker)
{
return (object) [
- 'name' => $faker->ipv4,
+ 'name' => $faker->ipv4(),
'description' => $faker->words(10),
];
}
diff --git a/tests/_support/View/SampleClassWithInitController.php b/tests/_support/View/SampleClassWithInitController.php
index 531b208dc6d7..32eb4f70a7a3 100644
--- a/tests/_support/View/SampleClassWithInitController.php
+++ b/tests/_support/View/SampleClassWithInitController.php
@@ -23,6 +23,8 @@
*/
class SampleClassWithInitController
{
+ private ResponseInterface $response;
+
public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
{
$this->response = $response;
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 4535096ccc61..fee7759bb264 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -66,6 +66,16 @@ public function testRunEmptyDefaultRoute()
$this->assertStringContainsString('Welcome to CodeIgniter', $output);
}
+ public function testRunEmptyDefaultRouteReturnResponse()
+ {
+ $_SERVER['argv'] = ['index.php'];
+ $_SERVER['argc'] = 1;
+
+ $response = $this->codeigniter->useSafeOutput(true)->run(null, true);
+
+ $this->assertStringContainsString('Welcome to CodeIgniter', $response->getBody());
+ }
+
public function testRunClosureRoute()
{
$_SERVER['argv'] = ['index.php', 'pages/about'];
@@ -78,7 +88,7 @@ public function testRunClosureRoute()
$routes->add('pages/(:segment)', static function ($segment) {
echo 'You want to see "' . esc($segment) . '" page.';
});
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -97,7 +107,7 @@ public function testRun404Override()
$routes = Services::routes();
$routes->setAutoRoute(false);
$routes->set404Override('Tests\Support\Controllers\Hello::index');
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -116,7 +126,7 @@ public function testRun404OverrideControllerReturnsResponse()
$routes = Services::routes();
$routes->setAutoRoute(false);
$routes->set404Override('Tests\Support\Controllers\Popcorn::pop');
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -126,6 +136,23 @@ public function testRun404OverrideControllerReturnsResponse()
$this->assertStringContainsString('Oops', $output);
}
+ public function testRun404OverrideReturnResponse()
+ {
+ $_SERVER['argv'] = ['index.php', '/'];
+ $_SERVER['argc'] = 2;
+
+ // Inject mock router.
+ $routes = Services::routes();
+ $routes->setAutoRoute(false);
+ $routes->set404Override('Tests\Support\Controllers\Popcorn::pop');
+ $router = Services::router($routes, Services::incomingrequest());
+ Services::injectMock('router', $router);
+
+ $response = $this->codeigniter->useSafeOutput(true)->run($routes, true);
+
+ $this->assertStringContainsString('Oops', $response->getBody());
+ }
+
public function testRun404OverrideByClosure()
{
$_SERVER['argv'] = ['index.php', '/'];
@@ -137,7 +164,7 @@ public function testRun404OverrideByClosure()
$routes->set404Override(static function () {
echo '404 Override by Closure.';
});
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -157,7 +184,7 @@ public function testControllersCanReturnString()
// Inject mock router.
$routes = Services::routes();
$routes->add('pages/(:segment)', static fn ($segment) => 'You want to see "' . esc($segment) . '" page.');
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -182,7 +209,7 @@ public function testControllersCanReturnResponseObject()
return $response->setBody($string);
});
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -209,7 +236,7 @@ public function testControllersCanReturnDownloadResponseObject()
return $response->download('some.txt', 'some text', true);
});
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -228,9 +255,9 @@ public function testControllersRunFilterByClassName()
// Inject mock router.
$routes = Services::routes();
- $routes->add('pages/about', static fn () => Services::request()->getBody(), ['filter' => Customfilter::class]);
+ $routes->add('pages/about', static fn () => Services::incomingrequest()->getBody(), ['filter' => Customfilter::class]);
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -258,7 +285,7 @@ public function testRoutesIsEmpty()
$_SERVER['argc'] = 2;
// Inject mock router.
- $router = Services::router(null, Services::request(), false);
+ $router = Services::router(null, Services::incomingrequest(), false);
Services::injectMock('router', $router);
ob_start();
@@ -335,7 +362,7 @@ public function testRunRedirectionWithNamed()
}, ['as' => 'name']);
$routes->addRedirect('example', 'name');
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -358,7 +385,7 @@ public function testRunRedirectionWithURI()
});
$routes->addRedirect('example', 'pages/uri');
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -382,7 +409,7 @@ public function testRunRedirectionWithURINotSet()
$routes = Services::routes();
$routes->addRedirect('example', 'pages/notset');
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -405,7 +432,7 @@ public function testRunRedirectionWithHTTPCode303()
$routes = Services::routes();
$routes->addRedirect('example', 'pages/notset', 301);
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -422,7 +449,7 @@ public function testStoresPreviousURL()
$_SERVER['argc'] = 2;
// Inject mock router.
- $router = Services::router(null, Services::request(), false);
+ $router = Services::router(null, Services::incomingrequest(), false);
Services::injectMock('router', $router);
ob_start();
@@ -446,7 +473,7 @@ public function testNotStoresPreviousURL()
$routes = Services::routes();
$routes->addRedirect('example', 'pages/notset', 301);
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -470,7 +497,7 @@ public function testNotStoresPreviousURLByCheckingContentType()
return $response->setContentType('image/jpeg', '');
});
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
ob_start();
@@ -537,7 +564,7 @@ public function testSpoofRequestMethodCanUsePUT()
$this->codeigniter->useSafeOutput(true)->run();
ob_get_clean();
- $this->assertSame('put', Services::request()->getMethod());
+ $this->assertSame('put', Services::incomingrequest()->getMethod());
}
public function testSpoofRequestMethodCannotUseGET()
@@ -561,7 +588,7 @@ public function testSpoofRequestMethodCannotUseGET()
$this->codeigniter->useSafeOutput(true)->run();
ob_get_clean();
- $this->assertSame('post', Services::request()->getMethod());
+ $this->assertSame('post', Services::incomingrequest()->getMethod());
}
/**
@@ -588,7 +615,7 @@ public function testPageCacheSendSecureHeaders()
return $response->setBody($string);
});
- $router = Services::router($routes, Services::request());
+ $router = Services::router($routes, Services::incomingrequest());
Services::injectMock('router', $router);
/** @var Filters $filterConfig */
@@ -619,7 +646,7 @@ public function testPageCacheSendSecureHeaders()
// Clear Page cache
command('cache:clear');
- // Remove stream fliters
+ // Remove stream filters
stream_filter_remove($outputStreamFilter);
stream_filter_remove($errorStreamFilter);
}
@@ -654,7 +681,7 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e
$_SERVER['REQUEST_URI'] = '/' . $testingUrl;
$routes = Services::routes(true);
$routes->add($testingUrl, static function () {
- CodeIgniter::cache(0); // Dont cache the page in the run() function because CodeIgniter class will create default $cacheConfig and overwrite settings from the dataProvider
+ CodeIgniter::cache(0); // Don't cache the page in the run() function because CodeIgniter class will create default $cacheConfig and overwrite settings from the dataProvider
$response = Services::response();
$string = 'This is a test page, to check cache configuration';
@@ -662,7 +689,7 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e
});
// Inject router
- $router = Services::router($routes, Services::request(null, false));
+ $router = Services::router($routes, Services::incomingrequest(null, false));
Services::injectMock('router', $router);
// Cache the page output using default caching function and $cacheConfig with value from the data provider
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index 1d0270f367b9..4a55df843777 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -20,6 +20,8 @@
use Config\Database;
/**
+ * @group DatabaseLive
+ *
* @internal
*/
final class CreateDatabaseTest extends CIUnitTestCase
diff --git a/tests/system/Commands/Database/MigrateStatusTest.php b/tests/system/Commands/Database/MigrateStatusTest.php
index 8f6997d01127..20e7485ca17f 100644
--- a/tests/system/Commands/Database/MigrateStatusTest.php
+++ b/tests/system/Commands/Database/MigrateStatusTest.php
@@ -15,6 +15,8 @@
use CodeIgniter\Test\Filters\CITestStreamFilter;
/**
+ * @group DatabaseLive
+ *
* @internal
*/
final class MigrateStatusTest extends CIUnitTestCase
diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index 2824588695c7..1cde7280c164 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -18,6 +18,8 @@
use Tests\Support\Database\Seeds\CITestSeeder;
/**
+ * @group DatabaseLive
+ *
* @internal
*/
final class ShowTableInfoTest extends CIUnitTestCase
diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php
index b80fcd5f0bb8..3938ea012aa7 100644
--- a/tests/system/Commands/DatabaseCommandsTest.php
+++ b/tests/system/Commands/DatabaseCommandsTest.php
@@ -15,6 +15,8 @@
use CodeIgniter\Test\Filters\CITestStreamFilter;
/**
+ * @group DatabaseLive
+ *
* @internal
*/
final class DatabaseCommandsTest extends CIUnitTestCase
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index 4ba9e8e0ffba..fbe95abc5564 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -86,8 +86,7 @@ public function testGenerateKeyShowsEncodedKey()
/**
* @runInSeparateProcess
- *
- * @preserveGlobalState disabled
+ * @preserveGlobalState disabled
*/
public function testGenerateKeyCreatesNewKey()
{
diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php
index c0970b5c317d..68de997ea7a5 100644
--- a/tests/system/Commands/MigrationIntegrationTest.php
+++ b/tests/system/Commands/MigrationIntegrationTest.php
@@ -15,6 +15,8 @@
use CodeIgniter\Test\Filters\CITestStreamFilter;
/**
+ * @group DatabaseLive
+ *
* @internal
*/
final class MigrationIntegrationTest extends CIUnitTestCase
diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index 03e675cfbfa5..365049315778 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -32,8 +32,7 @@ protected function setUp(): void
* See https://github.com/codeigniter4/CodeIgniter4/issues/1393
*
* @runInSeparateProcess
- *
- * @preserveGlobalState disabled
+ * @preserveGlobalState disabled
*/
public function testRedirectResponseCookiesSent()
{
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index a50069d3745b..1b3f9aaf7e06 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -177,10 +177,15 @@ public function testEscapeBadContext()
esc(['width' => '800', 'height' => '600'], 'bogus');
}
+ public function testEscapeBadContextZero()
+ {
+ $this->expectException('InvalidArgumentException');
+ esc('